pci: set multifunction property for normal device.

use pci_create_simple_multifunction() for normal device which sets
multifunction bit.
At the moment, only pc_piix.c and mips_malta.c uses multifunction
devices with piix3/4 pci-isa bridge.
And other boards don't populate those devices.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

diff --git a/hw/piix4.c b/hw/piix4.c
index 6f08c5a6dd14e9ad333ba88f0b2490ddae01a4c9..902d6daca0981dd42941c5c0d5840ec579215481 100644 (file)
--- a/hw/piix4.c
+++ b/hw/piix4.c
@@ -105,7 +105,7 @@ int piix4_init(PCIBus *bus, int devfn)
 {
     PCIDevice *d;
 
-    d = pci_create_simple(bus, devfn, "PIIX4");
+    d = pci_create_simple_multifunction(bus, devfn, true, "PIIX4");
     return d->devfn;
 }
 

diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index e947428cc12cfe6bb6c9928efe4f1ba32af2275d..3426686e6bcc95e233daaeab5ce00caaa6d58c60 100644 (file)
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -233,7 +233,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, qemu_irq *
     *pi440fx_state = DO_UPCAST(PCII440FXState, dev, d);
 
     piix3 = DO_UPCAST(PIIX3State, dev,
-                                 pci_create_simple(b, -1, "PIIX3"));
+                      pci_create_simple_multifunction(b, -1, true, "PIIX3"));
     piix3->pic = pic;
     pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3, 4);
     (*pi440fx_state)->piix3 = piix3;