xenppc-unstable.hg's xen.h is out-of-sync with xen-unstable.hg w.r.t the
types used in start_info_t.  Now that libxc is no longer creating a
start_info_t (patches 1 & 2 & 3), we don't have to worry about 32/64 bit
safeness of unsigned longs in the structure.  This patch syncs us back
to xen-unstable.hg's version of xen.h 

-- 
Ryan Harper
Software Engineer; Linux Technology Center
IBM Corp., Austin, Tx
(512) 838-9253   T/L: 678-9253
[EMAIL PROTECTED]


diffstat output:
 xen.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

Signed-off-by: Ryan Harper <[EMAIL PROTECTED]>
---
diff -r 1dfe1fd5eae4 xen/include/public/xen.h
--- a/xen/include/public/xen.h  Tue Jan 23 10:14:59 2007 -0600
+++ b/xen/include/public/xen.h  Tue Jan 23 10:46:26 2007 -0600
@@ -501,8 +501,8 @@ struct start_info {
 struct start_info {
     /* THE FOLLOWING ARE FILLED IN BOTH ON INITIAL BOOT AND ON RESUME.    */
     char magic[32];             /* "xen-<version>-<platform>".            */
-    xen_ulong_t nr_pages;       /* Total pages allocated to this domain.  */
-    xen_ulong_t shared_info;    /* MACHINE address of shared info struct. */
+    unsigned long nr_pages;     /* Total pages allocated to this domain.  */
+    unsigned long shared_info;  /* MACHINE address of shared info struct. */
     uint32_t flags;             /* SIF_xxx flags.                         */
     xen_pfn_t store_mfn;        /* MACHINE page number of shared page.    */
     uint32_t store_evtchn;      /* Event channel for store communication. */
@@ -517,11 +517,11 @@ struct start_info {
         } dom0;
     } console;
     /* THE FOLLOWING ARE ONLY FILLED IN ON INITIAL BOOT (NOT RESUME).     */
-    xen_ulong_t pt_base;        /* VIRTUAL address of page directory.     */
-    xen_ulong_t nr_pt_frames;   /* Number of bootstrap p.t. frames.       */
-    xen_ulong_t mfn_list;       /* VIRTUAL address of page-frame list.    */
-    xen_ulong_t mod_start;      /* VIRTUAL address of pre-loaded module.  */
-    xen_ulong_t mod_len;        /* Size (bytes) of pre-loaded module.     */
+    unsigned long pt_base;      /* VIRTUAL address of page directory.     */
+    unsigned long nr_pt_frames; /* Number of bootstrap p.t. frames.       */
+    unsigned long mfn_list;     /* VIRTUAL address of page-frame list.    */
+    unsigned long mod_start;    /* VIRTUAL address of pre-loaded module.  */
+    unsigned long mod_len;      /* Size (bytes) of pre-loaded module.     */
     int8_t cmd_line[MAX_GUEST_CMDLINE];
 };
 typedef struct start_info start_info_t;

_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@lists.xensource.com
http://lists.xensource.com/xen-ppc-devel

Reply via email to