Fixes from Christoph Egger

- xen-vl-exra.c: Only compile pci_emulation_add() w/  CONFIG_PASSTHROUGH
- Fix compiler confusion with tokens after #endif
- qemu-common.h: Fix merge botch with upstream
- qemu-xen.h: remove redundant declaration of pci_xen_platform_init
- xen_platform.c: take declaration of pci_xen_platform_init from
  xen_platform.h
- xen_platform.c: Make platform_fixed_ioport_save and
  platform_fixed_ioport_load static. They have no prototypes and aren't
  used elsewhere

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

diff --git a/block-raw-posix.c b/block-raw-posix.c
index 93bd2723a799ac34955cc1c712f5a33b60903faf..e8c10c1c6c96bd10fe6bfb0e8fa6bc7d15019f20 100644 (file)
--- a/block-raw-posix.c
+++ b/block-raw-posix.c
@@ -1232,4 +1232,4 @@ BlockDriver bdrv_host_device = {
     .bdrv_ioctl = raw_ioctl,
 };
 
-#endif CONFIG_STUBDOM
+#endif /* CONFIG_STUBDOM */

diff --git a/block-vvfat.c b/block-vvfat.c
index ae2ead9cf5800e937b437b5a14918001548d54ff..5aa2a009ccd685da1892a78bc2134b888a86a34f 100644 (file)
--- a/block-vvfat.c
+++ b/block-vvfat.c
@@ -1778,7 +1778,7 @@ DLOG(fprintf(stderr, "read cluster %d (sector %d)\n", (int)cluster_num, (int)clu
        }
 
        for (i = 0; i < 0x10 * s->sectors_per_cluster; i++) {
-           int cluster_count;
+           int cluster_count = 0;
 
 DLOG(fprintf(stderr, "check direntry %d: \n", i); print_direntry(direntries + i));
            if (is_volume_label(direntries + i) || is_dot(direntries + i) ||

diff --git a/hw/xen_platform.c b/hw/xen_platform.c
index e77ee9f0900ffd90cafec71ae041924812bc5c87..9827e3f6195daf658eb7bc8bfb068c8466600477 100644 (file)
--- a/hw/xen_platform.c
+++ b/hw/xen_platform.c
@@ -29,6 +29,7 @@
 #include "irq.h"
 #include "qemu-xen.h"
 #include "net.h"
+#include "xen_platform.h"
 
 #include <assert.h>
 #include <xenguest.h>
@@ -254,12 +255,12 @@ static uint32_t platform_fixed_ioport_read1(void *opaque, uint32_t addr)
     }
 }
 
-void platform_fixed_ioport_save(QEMUFile *f, void *opaque)
+static void platform_fixed_ioport_save(QEMUFile *f, void *opaque)
 {
     qemu_put_8s(f, &platform_flags);
 }
 
-int platform_fixed_ioport_load(QEMUFile *f, void *opaque, int version_id)
+static int platform_fixed_ioport_load(QEMUFile *f, void *opaque, int version_id)
 {
     uint8_t flags;
 

diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index c2310109d2ad20e8428825078cc8b15e7fdebb6c..a394d93685dbe9088df14e0c44c33885c6d677ea 100644 (file)
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -206,4 +206,4 @@ int qemu_paio_cancel(int fd, struct qemu_paiocb *aiocb)
     return ret;
 }
 
-#endif CONFIG_STUBDOM
+#endif /* CONFIG_STUBDOM */

diff --git a/qemu-common.h b/qemu-common.h
index c8c9b823defd183ea11b5a6ea2ad75af824c3386..f7bdb09e3c4fb624e13e7a7d66d1acc1518383b0 100644 (file)
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -133,17 +133,6 @@ int qemu_fls(int i);
 #define qemu_isascii(c)                isascii((unsigned char)(c))
 #define qemu_toascii(c)                toascii((unsigned char)(c))
 
-#define CTYPE(isfoobar,argumentchar) (isfoobar((unsigned char)(argumentchar)))
-  /* One must not pass a plain `char' to isupper, toupper, et al.  If
-   * it has the top bit set (ie, is negative if your chars are
-   * signed), undefined behaviour results.  The <ctype.h> functions
-   * are defined to take the value of an unsigned char, as an int.
-   * So use this macro.  You may pass toupper et al for isfoobar.
-   * Do not pass EOF as a character to this macro.  If you might have
-   * EOF then you ought to have it in an int representing an unsigned
-   * char, which is safe for the ctype macros directly.  Or test separately.
-   * Obviously don't use this for floating point things like isnan! */
-
 void *qemu_malloc(size_t size);
 void *qemu_realloc(void *ptr, size_t size);
 void *qemu_mallocz(size_t size);

diff --git a/qemu-xen.h b/qemu-xen.h
index ec4cd943f71905cbcb5fac42ccaa83a9c206e17b..34210f9cb2781147559d0384aec3d8fc23c7e0d6 100644 (file)
--- a/qemu-xen.h
+++ b/qemu-xen.h
@@ -24,7 +24,6 @@ void timeoffset_get(void);
 
 /* xen_platform.c */
 #ifndef QEMU_TOOL
-void pci_xen_platform_init(PCIBus *bus);
 void xen_vga_populate_vram(uint64_t vram_addr, uint32_t size);
 void xen_vga_vram_map(uint64_t vram_addr, uint32_t size);
 void set_vram_mapping(void *opaque, unsigned long begin, unsigned long end);

diff --git a/xen-vl-extra.c b/xen-vl-extra.c
index 8e449a8b670cf6fd8fc04812efb22d123ed28648..9be1acd03d5379c2102240dface31fcbe757beae 100644 (file)
--- a/xen-vl-extra.c
+++ b/xen-vl-extra.c
@@ -132,7 +132,6 @@ void do_pci_add(char *devname)
 
     acpi_php_add(pci_slot);
 }
-#endif
 
 int pci_emulation_add(char *config_text)
 {
@@ -145,3 +144,4 @@ int pci_emulation_add(char *config_text)
     PciEmulationInfoHead = new;
     return 0;
 }
+#endif