[Xen-changelog] [xen-unstable] [IA64] libxc trivial fix compilation error.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1181683435 21600
# Node ID 67f6dd9f1a1b92463c6c42df690c8acbc7b4fe9c
# Parent  f5d22922444db066d1cd269638ddb04f6604e4fd
[IA64] libxc trivial fix compilation error.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 tools/libxc/ia64/xc_ia64_hvm_build.c |    2 +-
 tools/libxc/xc_dom_ia64.c            |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r f5d22922444d -r 67f6dd9f1a1b tools/libxc/ia64/xc_ia64_hvm_build.c
--- a/tools/libxc/ia64/xc_ia64_hvm_build.c      Tue Jun 12 15:22:02 2007 -0600
+++ b/tools/libxc/ia64/xc_ia64_hvm_build.c      Tue Jun 12 15:23:55 2007 -0600
@@ -834,7 +834,7 @@ xc_ia64_setup_memmap_info(int xc_handle,
     
     assert(nr_mds <=
            (PAGE_SIZE * memmap_info_num_pages -
-            offsetof(*memmap_info, memdesc))/sizeof(*md));
+            offsetof(typeof(*memmap_info), memdesc))/sizeof(*md));
     memmap_info->efi_memmap_size = nr_mds * sizeof(*md);
     memmap_info->efi_memdesc_size = sizeof(*md);
     memmap_info->efi_memdesc_version = EFI_MEMORY_DESCRIPTOR_VERSION;
diff -r f5d22922444d -r 67f6dd9f1a1b tools/libxc/xc_dom_ia64.c
--- a/tools/libxc/xc_dom_ia64.c Tue Jun 12 15:22:02 2007 -0600
+++ b/tools/libxc/xc_dom_ia64.c Tue Jun 12 15:23:55 2007 -0600
@@ -203,9 +203,9 @@ static int ia64_setup_memmap(struct xc_d
     num_mds++;
     memmap_info->efi_memmap_size = num_mds * sizeof(md[0]);
     munmap(memmap_info, page_size * memmap_info_num_pages);
-    assert(nr_mds <=
+    assert(num_mds <=
            (page_size * memmap_info_num_pages -
-            offsetof(*memmap_info, memdesc))/sizeof(*md));
+            offsetof(typeof(*memmap_info), memdesc))/sizeof(*md));
 
     /*
      * kludge: we need to pass memmap_info page's pfn and other magic pages

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog