[Xen-changelog] [xen-unstable] ioemu: Clean up compile warnings.

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

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1194269035 0
# Node ID dfe9c0c10a2cf0405236bdfd475d7c8939b692c4
# Parent  a609b4fc411d8f3b826ed3cebfd4369702f3c2fd
ioemu: Clean up compile warnings.
Signed-off-by: Atsushi SAKAI <sakaia@xxxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 tools/ioemu/hw/xen_machine_fv.c |    2 ++
 tools/ioemu/hw/xen_machine_pv.c |    3 ++-
 tools/ioemu/hw/xen_platform.c   |   15 ++++++++-------
 tools/ioemu/vl.h                |    2 +-
 tools/ioemu/xenstore.c          |    4 ++--
 5 files changed, 15 insertions(+), 11 deletions(-)

diff -r a609b4fc411d -r dfe9c0c10a2c tools/ioemu/hw/xen_machine_fv.c
--- a/tools/ioemu/hw/xen_machine_fv.c   Mon Nov 05 13:15:56 2007 +0000
+++ b/tools/ioemu/hw/xen_machine_fv.c   Mon Nov 05 13:23:55 2007 +0000
@@ -194,7 +194,9 @@ static void xen_init_fv(uint64_t ram_siz
                         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 -r a609b4fc411d -r dfe9c0c10a2c tools/ioemu/hw/xen_machine_pv.c
--- a/tools/ioemu/hw/xen_machine_pv.c   Mon Nov 05 13:15:56 2007 +0000
+++ b/tools/ioemu/hw/xen_machine_pv.c   Mon Nov 05 13:23:55 2007 +0000
@@ -35,7 +35,8 @@ static void xen_init_pv(uint64_t ram_siz
                        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 -r a609b4fc411d -r dfe9c0c10a2c tools/ioemu/hw/xen_platform.c
--- a/tools/ioemu/hw/xen_platform.c     Mon Nov 05 13:15:56 2007 +0000
+++ b/tools/ioemu/hw/xen_platform.c     Mon Nov 05 13:23:55 2007 +0000
@@ -38,21 +38,22 @@ static uint32_t platform_mmio_read(void 
 {
     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 -r a609b4fc411d -r dfe9c0c10a2c tools/ioemu/vl.h
--- a/tools/ioemu/vl.h  Mon Nov 05 13:15:56 2007 +0000
+++ b/tools/ioemu/vl.h  Mon Nov 05 13:23:55 2007 +0000
@@ -1477,7 +1477,7 @@ int xenstore_unsubscribe_from_hotplug_st
                                              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 -r a609b4fc411d -r dfe9c0c10a2c tools/ioemu/xenstore.c
--- a/tools/ioemu/xenstore.c    Mon Nov 05 13:15:56 2007 +0000
+++ b/tools/ioemu/xenstore.c    Mon Nov 05 13:23:55 2007 +0000
@@ -303,7 +303,7 @@ void xenstore_process_logdirty_event(voi
         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_st
     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;
 

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