On 10/03/2020 19:06, BALATON Zoltan wrote:
> Follow example of CMD646 and remove via_init_ide function and do it
> directly in board code instead.
>
> Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu>
> ---
> hw/ide/via.c | 8 --------
> hw/mips/mips_fulong2e.c | 5 ++++-
> include/hw/ide.h | 1 -
> 3 files changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/hw/ide/via.c b/hw/ide/via.c
> index 096de8dba0..df0b352b58 100644
> --- a/hw/ide/via.c
> +++ b/hw/ide/via.c
> @@ -213,14 +213,6 @@ static void via_ide_exitfn(PCIDevice *dev)
> }
> }
>
> -void via_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn)
> -{
> - PCIDevice *dev;
> -
> - dev = pci_create_simple(bus, devfn, "via-ide");
> - pci_ide_create_devs(dev, hd_table);
> -}
> -
> static void via_ide_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
> index 4727b1d3a4..639ba2a091 100644
> --- a/hw/mips/mips_fulong2e.c
> +++ b/hw/mips/mips_fulong2e.c
> @@ -37,6 +37,7 @@
> #include "qemu/log.h"
> #include "hw/loader.h"
> #include "hw/ide.h"
> +#include "hw/ide/pci.h"
> #include "elf.h"
> #include "hw/isa/vt82c686.h"
> #include "hw/rtc/mc146818rtc.h"
> @@ -239,6 +240,7 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus,
> int slot, qemu_irq intc,
> qemu_irq *i8259;
> ISABus *isa_bus;
> DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
> + PCIDevice *dev;
>
> isa_bus = vt82c686b_isa_init(pci_bus, PCI_DEVFN(slot, 0));
> if (!isa_bus) {
> @@ -256,8 +258,9 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus,
> int slot, qemu_irq intc,
> /* Super I/O */
> isa_create_simple(isa_bus, TYPE_VT82C686B_SUPERIO);
>
> + dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), "via-ide");
> ide_drive_get(hd, ARRAY_SIZE(hd));
> - via_ide_init(pci_bus, hd, PCI_DEVFN(slot, 1));
> + pci_ide_create_devs(dev, hd);
>
> pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci");
> pci_create_simple(pci_bus, PCI_DEVFN(slot, 3), "vt82c686b-usb-uhci");
> diff --git a/include/hw/ide.h b/include/hw/ide.h
> index 0c7080ed92..dea0ecf5be 100644
> --- a/include/hw/ide.h
> +++ b/include/hw/ide.h
> @@ -16,7 +16,6 @@ PCIDevice *pci_piix3_xen_ide_init(PCIBus *bus, DriveInfo
> **hd_table, int devfn);
> PCIDevice *pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn);
> PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn);
> int pci_piix3_xen_ide_unplug(DeviceState *dev, bool aux);
> -void via_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn);
>
> /* ide-mmio.c */
> void mmio_ide_init_drives(DeviceState *dev, DriveInfo *hd0, DriveInfo *hd1);
Reviewed-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
ATB,
Mark.
