ioemu: a bunch of fixes
PATCH 1/1 ioemu: a bunch of fixes
Hi Ian,
attached patch contains a couple of fixes
for git ioemu tree:
- 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
- xen-config.mak: Don't hardcode install path. Different package systems on different OS's/distributions have different install paths.
Signature · 6 lines
---to satisfy European Law for business letters: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
block-raw-posix.c +1 -1
@@ -1232,4 +1232,4 @@ BlockDriver bdrv_host_device = { .bdrv_ioctl = raw_ioctl, }; -#endif CONFIG_STUBDOM +#endif /* CONFIG_STUBDOM */
block-vvfat.c +1 -1
@@ -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) ||
hw/xen_platform.c +3 -2
@@ -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;
posix-aio-compat.c +1 -1
@@ -206,4 +206,4 @@ int qemu_paio_cancel(int fd, struct qemu_paiocb *aiocb) return ret; } -#endif CONFIG_STUBDOM +#endif /* CONFIG_STUBDOM */
qemu-common.h +0 -11
@@ -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);
qemu-xen.h +0 -1
@@ -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);
xen-config.mak +1 -1
@@ -8,4 +8,4 @@ CONFIG_SOFTMMU=yes CFLAGS += -I$(QEMU_ROOT)/hw -bindir = ${prefix}/${LIBLEAFDIR}/xen/bin +bindir = ${prefix}/${LIBEXEC}
xen-vl-extra.c +1 -1
@@ -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
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel