summaryrefslogtreecommitdiffstats
path: root/hw/ide/piix.c
diff options
context:
space:
mode:
authorMarkus Armbruster2010-06-24 19:59:29 +0200
committerKevin Wolf2010-07-02 13:18:02 +0200
commit57c888664b5eb7edbbce4be98cb1406aa0d85c2b (patch)
tree5e91ed5fded1e54c74c24ba14f2ab96e2fec4d2e /hw/ide/piix.c
parentblock: Fix virtual media change for if=none (diff)
downloadqemu-57c888664b5eb7edbbce4be98cb1406aa0d85c2b.tar.gz
qemu-57c888664b5eb7edbbce4be98cb1406aa0d85c2b.tar.xz
qemu-57c888664b5eb7edbbce4be98cb1406aa0d85c2b.zip
ide: Make PIIX and ISA IDE init functions return the qdev
Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide/piix.c')
-rw-r--r--hw/ide/piix.c6
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[] = {