ioemu: Clean up compile warnings.

Signed-off-by: Atsushi SAKAI <sakaia@jp.fujitsu.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/ioemu/hw/xen_machine_fv.c b/tools/ioemu/hw/xen_machine_fv.c
index 1db5e7f9e8376f526c10b30fa04fc54d1c753b37..68b04f9e00f26945a9f1f60e3a55ec252fee38ce 100644 (file)
--- a/tools/ioemu/hw/xen_machine_fv.c
+++ b/tools/ioemu/hw/xen_machine_fv.c
@@ -194,7 +194,9 @@ static void xen_init_fv(uint64_t ram_size, int vga_ram_size, char *boot_device,
                         const char *initrd_filename,
                         const char *direct_pci)
 {
+#if defined(__i386__) || defined(__x86_64__)
     unsigned long ioreq_pfn;
+#endif
     extern void *shared_page;
     extern void *buffered_io_page;
 #ifdef __ia64__

diff --git a/tools/ioemu/hw/xen_machine_pv.c b/tools/ioemu/hw/xen_machine_pv.c
index ab29f0244f10a6d6de6130f7c8952771db99b736..41f051dbf81e68dc5dfd0fae750c3986f49e1ca2 100644 (file)
--- a/tools/ioemu/hw/xen_machine_pv.c
+++ b/tools/ioemu/hw/xen_machine_pv.c
@@ -35,7 +35,8 @@ static void xen_init_pv(uint64_t ram_size, int vga_ram_size, char *boot_device,
                        int snapshot,
                        const char *kernel_filename,
                        const char *kernel_cmdline,
-                       const char *initrd_filename)
+                       const char *initrd_filename,
+                       const char *direct_pci)
 {
     struct xenfb *xenfb;
     extern int domid;

diff --git a/tools/ioemu/hw/xen_platform.c b/tools/ioemu/hw/xen_platform.c
index 9eaf35269c4a31cd2630419382ae4f047820e502..597e2c05e6220d54cfaf640102a5986ba54b1aea 100644 (file)
--- a/tools/ioemu/hw/xen_platform.c
+++ b/tools/ioemu/hw/xen_platform.c
@@ -38,21 +38,22 @@ static uint32_t platform_mmio_read(void *opaque, target_phys_addr_t addr)
 {
     static int warnings = 0;
     if (warnings < 5) {
-           fprintf(logfile, "Warning: attempted read from physical address "
-                   "0x%lx in xen platform mmio space\n", addr);
-           warnings++;
+        fprintf(logfile, "Warning: attempted read from physical address "
+                "0x%"PRIx64" in xen platform mmio space\n", (uint64_t)addr);
+        warnings++;
     }
     return 0;
 }
 
 static void platform_mmio_write(void *opaque, target_phys_addr_t addr,
-                              uint32_t val)
+                                uint32_t val)
 {
     static int warnings = 0;
     if (warnings < 5) {
-           fprintf(logfile, "Warning: attempted write of 0x%x to physical "
-                   "address 0x%lx in xen platform mmio space\n", val, addr);
-           warnings++;
+        fprintf(logfile, "Warning: attempted write of 0x%x to physical "
+                "address 0x%"PRIx64" in xen platform mmio space\n",
+                val, (uint64_t)addr);
+        warnings++;
     }
     return;
 }

diff --git a/tools/ioemu/vl.h b/tools/ioemu/vl.h
index 9dd8ec0c76705a0055982a79c4e6464e89d55273..c5514962c30501b31532c3dd643a06a166fb28ca 100644 (file)
--- a/tools/ioemu/vl.h
+++ b/tools/ioemu/vl.h
@@ -1477,7 +1477,7 @@ int xenstore_unsubscribe_from_hotplug_status(struct xs_handle *handle,
                                              const char *token);
 
 int xenstore_vm_write(int domid, char *key, char *val);
-char *xenstore_vm_read(int domid, char *key, int *len);
+char *xenstore_vm_read(int domid, char *key, unsigned int *len);
 
 /* helper2.c */
 extern long time_offset;

diff --git a/tools/ioemu/xenstore.c b/tools/ioemu/xenstore.c
index f24075eb3075513f782bf9bbfd8aa14865dd3f27..08524fe914627ef1cbcd822ff390398ed7e110e3 100644 (file)
--- a/tools/ioemu/xenstore.c
+++ b/tools/ioemu/xenstore.c
@@ -303,7 +303,7 @@ void xenstore_process_logdirty_event(void)
         logdirty_bitmap_size *= sizeof (unsigned long); /* bytes */
 
         /* Map the shared-memory segment */
-        fprintf(logfile, "%s: key=%16.16llx size=%d\n", __FUNCTION__,
+        fprintf(logfile, "%s: key=%16.16llx size=%lu\n", __FUNCTION__,
                 (unsigned long long)key, logdirty_bitmap_size);
         shmid = shmget(key, 2 * logdirty_bitmap_size, S_IRUSR|S_IWUSR);
         if (shmid == -1) {
@@ -676,7 +676,7 @@ int xenstore_unsubscribe_from_hotplug_status(struct xs_handle *handle,
     return rc;
 }
 
-char *xenstore_vm_read(int domid, char *key, int *len)
+char *xenstore_vm_read(int domid, char *key, unsigned int *len)
 {
     char *buf = NULL, *path = NULL, *value = NULL;