Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
Index: ioemu-remote/hw/pc.c
===================================================================
--- ioemu-remote.orig/hw/pc.c 2009-02-17 17:24:14.000000000 +0900
+++ ioemu-remote/hw/pc.c 2009-02-17 17:24:17.000000000 +0900
@@ -946,7 +946,7 @@ static void pc_init1(ram_addr_t ram_size
if (pci_enabled) {
pci_bus = i440fx_init(&i440fx_state, i8259);
- piix3_devfn = piix3_init(pci_bus, -1);
+ piix3_devfn = piix3_init(pci_bus);
} else {
pci_bus = NULL;
}
Index: ioemu-remote/hw/pc.h
===================================================================
--- ioemu-remote.orig/hw/pc.h 2009-02-17 17:23:25.000000000 +0900
+++ ioemu-remote/hw/pc.h 2009-02-17 17:24:17.000000000 +0900
@@ -106,7 +106,7 @@ int pcspk_audio_init(AudioState *, qemu_
/* piix_pci.c */
PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic);
void i440fx_set_smm(PCIDevice *d, int val);
-int piix3_init(PCIBus *bus, int devfn);
+int piix3_init(PCIBus *bus);
void i440fx_init_memory_mappings(PCIDevice *d);
int piix4_init(PCIBus *bus, int devfn);
Index: ioemu-remote/hw/piix_pci.c
===================================================================
--- ioemu-remote.orig/hw/piix_pci.c 2009-02-17 17:23:25.000000000 +0900
+++ ioemu-remote/hw/piix_pci.c 2009-02-17 17:24:17.000000000 +0900
@@ -348,13 +348,13 @@ static int piix_load(QEMUFile* f, void *
return pci_device_load(d, f);
}
-int piix3_init(PCIBus *bus, int devfn)
+int piix3_init(PCIBus *bus)
{
PCIDevice *d;
uint8_t *pci_conf;
d = pci_register_device(bus, "PIIX3", sizeof(PCIDevice),
- devfn, NULL, piix3_write_config);
+ -1, NULL, piix3_write_config);
register_savevm("PIIX3", 0, 2, piix_save, piix_load, d);
piix3_dev = d;
--
--
Simon Horman
VA Linux Systems Japan K.K., Sydney, Australia Satellite Office
H: www.vergenet.net/~horms/ W: www.valinux.co.jp/en
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home