[Qemu-devel] [patch 2/5] ioemu: Remove lsi_scsi_init()s devfn parameter as it is always passed as -1

[Simon Horman]

Signed-off-by: Simon Horman <address@hidden>

Index: qemu/hw/pc.c
===================================================================
--- qemu.orig/hw/pc.c   2009-02-23 17:09:27.000000000 +1100
+++ qemu/hw/pc.c        2009-02-23 17:11:48.000000000 +1100
@@ -933,7 +933,7 @@ vga_bios_error:
 
     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: qemu/hw/pc.h
===================================================================
--- qemu.orig/hw/pc.h   2009-02-20 19:47:46.000000000 +1100
+++ qemu/hw/pc.h        2009-02-23 17:11:48.000000000 +1100
@@ -113,7 +113,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);
 
 extern PCIDevice *piix4_dev;
Index: qemu/hw/piix_pci.c
===================================================================
--- qemu.orig/hw/piix_pci.c     2009-02-20 19:47:46.000000000 +1100
+++ qemu/hw/piix_pci.c  2009-02-23 17:11:48.000000000 +1100
@@ -322,13 +322,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, NULL);
+                                    -1, NULL, NULL);
     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