direct-io.hg

changeset 15358:67f6dd9f1a1b

[IA64] libxc trivial fix compilation error.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author Alex Williamson <alex.williamson@hp.com>
date Tue Jun 12 15:23:55 2007 -0600 (2007-06-12)
parents f5d22922444d
children 883ede7d9c1c
files tools/libxc/ia64/xc_ia64_hvm_build.c tools/libxc/xc_dom_ia64.c
line diff
     1.1 --- a/tools/libxc/ia64/xc_ia64_hvm_build.c	Tue Jun 12 15:22:02 2007 -0600
     1.2 +++ b/tools/libxc/ia64/xc_ia64_hvm_build.c	Tue Jun 12 15:23:55 2007 -0600
     1.3 @@ -834,7 +834,7 @@ xc_ia64_setup_memmap_info(int xc_handle,
     1.4      
     1.5      assert(nr_mds <=
     1.6             (PAGE_SIZE * memmap_info_num_pages -
     1.7 -            offsetof(*memmap_info, memdesc))/sizeof(*md));
     1.8 +            offsetof(typeof(*memmap_info), memdesc))/sizeof(*md));
     1.9      memmap_info->efi_memmap_size = nr_mds * sizeof(*md);
    1.10      memmap_info->efi_memdesc_size = sizeof(*md);
    1.11      memmap_info->efi_memdesc_version = EFI_MEMORY_DESCRIPTOR_VERSION;
     2.1 --- a/tools/libxc/xc_dom_ia64.c	Tue Jun 12 15:22:02 2007 -0600
     2.2 +++ b/tools/libxc/xc_dom_ia64.c	Tue Jun 12 15:23:55 2007 -0600
     2.3 @@ -203,9 +203,9 @@ static int ia64_setup_memmap(struct xc_d
     2.4      num_mds++;
     2.5      memmap_info->efi_memmap_size = num_mds * sizeof(md[0]);
     2.6      munmap(memmap_info, page_size * memmap_info_num_pages);
     2.7 -    assert(nr_mds <=
     2.8 +    assert(num_mds <=
     2.9             (page_size * memmap_info_num_pages -
    2.10 -            offsetof(*memmap_info, memdesc))/sizeof(*md));
    2.11 +            offsetof(typeof(*memmap_info), memdesc))/sizeof(*md));
    2.12  
    2.13      /*
    2.14       * kludge: we need to pass memmap_info page's pfn and other magic pages