ia64/xen-unstable

changeset 17430:3105a548e2f5

hvmloader: Fix build with gcc 4.1 and later.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Apr 10 09:12:44 2008 +0100 (2008-04-10)
parents 5b25d3264f7e
children 85848be18ba2
files tools/firmware/hvmloader/hvmloader.c
line diff
     1.1 --- a/tools/firmware/hvmloader/hvmloader.c	Wed Apr 09 17:49:25 2008 +0100
     1.2 +++ b/tools/firmware/hvmloader/hvmloader.c	Thu Apr 10 09:12:44 2008 +0100
     1.3 @@ -360,7 +360,7 @@ static int scan_etherboot_nic(void *copy
     1.4          for ( ; ; )
     1.5          {
     1.6              /* Invalid signature means we're out of option ROMs. */
     1.7 -            if ( strncmp(rom->signature, "\x55\xaa", 2) ||
     1.8 +            if ( strncmp((char *)rom->signature, "\x55\xaa", 2) ||
     1.9                   (rom->rom_size == 0) )
    1.10                  break;
    1.11  
    1.12 @@ -375,7 +375,7 @@ static int scan_etherboot_nic(void *copy
    1.13              pcih = (struct option_rom_pci_header *)
    1.14                  ((char *)rom + rom->pci_header_offset);
    1.15              if ( (rom->pci_header_offset != 0) &&
    1.16 -                 !strncmp(pcih->signature, "PCIR", 4) &&
    1.17 +                 !strncmp((char *)pcih->signature, "PCIR", 4) &&
    1.18                   (pcih->vendor_id == vendor_id) &&
    1.19                   (pcih->device_id == device_id) )
    1.20                  goto found;
    1.21 @@ -393,7 +393,7 @@ static int scan_etherboot_nic(void *copy
    1.22              ? ((struct option_rom_pnp_header *)
    1.23                 ((char *)rom + rom->expansion_header_offset))
    1.24              : ((struct option_rom_pnp_header *)NULL));
    1.25 -    while ( (pnph != NULL) && strncmp(pnph->signature, "$PnP", 4) )
    1.26 +    while ( (pnph != NULL) && strncmp((char *)pnph->signature, "$PnP", 4) )
    1.27          pnph = ((pnph->next_header_offset != 0)
    1.28                  ? ((struct option_rom_pnp_header *)
    1.29                     ((char *)rom + pnph->next_header_offset))