diff options
author | BALATON Zoltan <balaton@eik.bme.hu> | 2020-03-17 16:05:37 +0100 |
---|---|---|
committer | John Snow <jsnow@redhat.com> | 2020-03-17 12:22:36 -0400 |
commit | f42b65b8a0e8d556f3a802e32908aaf40e619341 (patch) | |
tree | fa98f2147281b1c2b73e0c56ed987f0e46cd981e /hw | |
parent | 902283c1df32de3a08b6410aad7a738d179dc8af (diff) | |
download | qemu-f42b65b8a0e8d556f3a802e32908aaf40e619341.zip qemu-f42b65b8a0e8d556f3a802e32908aaf40e619341.tar.gz qemu-f42b65b8a0e8d556f3a802e32908aaf40e619341.tar.bz2 |
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')
-rw-r--r-- | hw/ide/piix.c | 12 | ||||
-rw-r--r-- | hw/isa/piix4.c | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 8bcd6b7..3b2de4c 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -208,17 +208,6 @@ static void pci_piix_ide_exitfn(PCIDevice *dev) } } -/* hd_table must contain 4 block drivers */ -/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ -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; -} - /* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ static void piix3_ide_class_init(ObjectClass *klass, void *data) { @@ -247,6 +236,7 @@ static const TypeInfo piix3_ide_xen_info = { .class_init = piix3_ide_class_init, }; +/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ static void piix4_ide_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 2cbdcd7..706eb5b 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"); |