diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-06 08:31:43 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-06 08:31:43 -0500 |
| commit | 734003e6153b3552b9406ef598a1e67aac4a899e (patch) | |
| tree | 9e4b225de8915dfecaec15356f085f9cb36057f7 /hw/ide/piix.c | |
| parent | 02d0ba1420803562109185f47be6f7430bfdefae (diff) | |
| parent | de189a1b4a471d37a2909e97646654fc9751b52f (diff) | |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw/ide/piix.c')
| -rw-r--r-- | hw/ide/piix.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/ide/piix.c b/hw/ide/piix.c index dad6e86ff6..fa22226dce 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -160,22 +160,24 @@ static int pci_piix4_ide_initfn(PCIDevice *dev) /* hd_table must contain 4 block drivers */ /* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ -void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) +PCIDevice *pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) { PCIDevice *dev; dev = pci_create_simple(bus, devfn, "piix3-ide"); pci_ide_create_devs(dev, hd_table); + return dev; } /* hd_table must contain 4 block drivers */ /* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ -void pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) +PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) { PCIDevice *dev; dev = pci_create_simple(bus, devfn, "piix4-ide"); pci_ide_create_devs(dev, hd_table); + return dev; } static PCIDeviceInfo piix_ide_info[] = { |