ia64/xen-unstable

changeset 16319:dfe9c0c10a2c

ioemu: Clean up compile warnings.
Signed-off-by: Atsushi SAKAI <sakaia@jp.fujitsu.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
author Keir Fraser <keir@xensource.com>
date Mon Nov 05 13:23:55 2007 +0000 (2007-11-05)
parents a609b4fc411d
children d945240821e7
files tools/ioemu/hw/xen_machine_fv.c tools/ioemu/hw/xen_machine_pv.c tools/ioemu/hw/xen_platform.c tools/ioemu/vl.h tools/ioemu/xenstore.c
line diff
     1.1 --- a/tools/ioemu/hw/xen_machine_fv.c	Mon Nov 05 13:15:56 2007 +0000
     1.2 +++ b/tools/ioemu/hw/xen_machine_fv.c	Mon Nov 05 13:23:55 2007 +0000
     1.3 @@ -194,7 +194,9 @@ static void xen_init_fv(uint64_t ram_siz
     1.4                          const char *initrd_filename,
     1.5                          const char *direct_pci)
     1.6  {
     1.7 +#if defined(__i386__) || defined(__x86_64__)
     1.8      unsigned long ioreq_pfn;
     1.9 +#endif
    1.10      extern void *shared_page;
    1.11      extern void *buffered_io_page;
    1.12  #ifdef __ia64__
     2.1 --- a/tools/ioemu/hw/xen_machine_pv.c	Mon Nov 05 13:15:56 2007 +0000
     2.2 +++ b/tools/ioemu/hw/xen_machine_pv.c	Mon Nov 05 13:23:55 2007 +0000
     2.3 @@ -35,7 +35,8 @@ static void xen_init_pv(uint64_t ram_siz
     2.4  			int snapshot,
     2.5  			const char *kernel_filename,
     2.6  			const char *kernel_cmdline,
     2.7 -			const char *initrd_filename)
     2.8 +			const char *initrd_filename,
     2.9 +			const char *direct_pci)
    2.10  {
    2.11      struct xenfb *xenfb;
    2.12      extern int domid;
     3.1 --- a/tools/ioemu/hw/xen_platform.c	Mon Nov 05 13:15:56 2007 +0000
     3.2 +++ b/tools/ioemu/hw/xen_platform.c	Mon Nov 05 13:23:55 2007 +0000
     3.3 @@ -38,21 +38,22 @@ static uint32_t platform_mmio_read(void 
     3.4  {
     3.5      static int warnings = 0;
     3.6      if (warnings < 5) {
     3.7 -	    fprintf(logfile, "Warning: attempted read from physical address "
     3.8 -		    "0x%lx in xen platform mmio space\n", addr);
     3.9 -	    warnings++;
    3.10 +        fprintf(logfile, "Warning: attempted read from physical address "
    3.11 +                "0x%"PRIx64" in xen platform mmio space\n", (uint64_t)addr);
    3.12 +        warnings++;
    3.13      }
    3.14      return 0;
    3.15  }
    3.16  
    3.17  static void platform_mmio_write(void *opaque, target_phys_addr_t addr,
    3.18 -			       uint32_t val)
    3.19 +                                uint32_t val)
    3.20  {
    3.21      static int warnings = 0;
    3.22      if (warnings < 5) {
    3.23 -	    fprintf(logfile, "Warning: attempted write of 0x%x to physical "
    3.24 -		    "address 0x%lx in xen platform mmio space\n", val, addr);
    3.25 -	    warnings++;
    3.26 +        fprintf(logfile, "Warning: attempted write of 0x%x to physical "
    3.27 +                "address 0x%"PRIx64" in xen platform mmio space\n",
    3.28 +                val, (uint64_t)addr);
    3.29 +        warnings++;
    3.30      }
    3.31      return;
    3.32  }
     4.1 --- a/tools/ioemu/vl.h	Mon Nov 05 13:15:56 2007 +0000
     4.2 +++ b/tools/ioemu/vl.h	Mon Nov 05 13:23:55 2007 +0000
     4.3 @@ -1477,7 +1477,7 @@ int xenstore_unsubscribe_from_hotplug_st
     4.4                                               const char *token);
     4.5  
     4.6  int xenstore_vm_write(int domid, char *key, char *val);
     4.7 -char *xenstore_vm_read(int domid, char *key, int *len);
     4.8 +char *xenstore_vm_read(int domid, char *key, unsigned int *len);
     4.9  
    4.10  /* helper2.c */
    4.11  extern long time_offset;
     5.1 --- a/tools/ioemu/xenstore.c	Mon Nov 05 13:15:56 2007 +0000
     5.2 +++ b/tools/ioemu/xenstore.c	Mon Nov 05 13:23:55 2007 +0000
     5.3 @@ -303,7 +303,7 @@ void xenstore_process_logdirty_event(voi
     5.4          logdirty_bitmap_size *= sizeof (unsigned long); /* bytes */
     5.5  
     5.6          /* Map the shared-memory segment */
     5.7 -        fprintf(logfile, "%s: key=%16.16llx size=%d\n", __FUNCTION__,
     5.8 +        fprintf(logfile, "%s: key=%16.16llx size=%lu\n", __FUNCTION__,
     5.9                  (unsigned long long)key, logdirty_bitmap_size);
    5.10          shmid = shmget(key, 2 * logdirty_bitmap_size, S_IRUSR|S_IWUSR);
    5.11          if (shmid == -1) {
    5.12 @@ -676,7 +676,7 @@ int xenstore_unsubscribe_from_hotplug_st
    5.13      return rc;
    5.14  }
    5.15  
    5.16 -char *xenstore_vm_read(int domid, char *key, int *len)
    5.17 +char *xenstore_vm_read(int domid, char *key, unsigned int *len)
    5.18  {
    5.19      char *buf = NULL, *path = NULL, *value = NULL;
    5.20