summaryrefslogtreecommitdiffstats
path: root/hw/isa
diff options
context:
space:
mode:
authorBALATON Zoltan2020-03-17 16:05:37 +0100
committerJohn Snow2020-03-17 17:22:36 +0100
commitf42b65b8a0e8d556f3a802e32908aaf40e619341 (patch)
treefa98f2147281b1c2b73e0c56ed987f0e46cd981e /hw/isa
parenthw/isa/piix4.c: Introduce variable to store devfn (diff)
downloadqemu-f42b65b8a0e8d556f3a802e32908aaf40e619341.tar.gz
qemu-f42b65b8a0e8d556f3a802e32908aaf40e619341.tar.xz
qemu-f42b65b8a0e8d556f3a802e32908aaf40e619341.zip
hw/ide: Get rid of piix4_init function
This removes pci_piix4_ide_init() function similar to clean up done to other ide devices. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Markus Armbruster <armbru@redhat.com> Message-id: fe46b6536abbae77695f6d1c711a04a3f4b5481d.1584457537.git.balaton@eik.bme.hu Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'hw/isa')
-rw-r--r--hw/isa/piix4.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 2cbdcd7700..706eb5be69 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -35,6 +35,7 @@
#include "hw/timer/i8254.h"
#include "hw/rtc/mc146818rtc.h"
#include "hw/ide.h"
+#include "hw/ide/pci.h"
#include "migration/vmstate.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
@@ -256,9 +257,10 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus,
*isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
}
+ pci = pci_create_simple(pci_bus, devfn + 1, "piix4-ide");
hd = g_new(DriveInfo *, ide_drives);
ide_drive_get(hd, ide_drives);
- pci_piix4_ide_init(pci_bus, hd, devfn + 1);
+ pci_ide_create_devs(pci, hd);
g_free(hd);
pci_create_simple(pci_bus, devfn + 2, "piix4-usb-uhci");