[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 09/18] hw/ide/piix: Use generic ide_bus_init_ioport()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 09/18] hw/ide/piix: Use generic ide_bus_init_ioport() |
Date: |
Thu, 2 Mar 2023 23:40:49 +0100 |
TYPE_PIIX3_IDE is a PCI function inheriting from QOM
TYPE_PCI_DEVICE. To be able to call the ISA specific
ide_init_ioport_isa(), we call this function passing
a NULL ISADevice argument. Remove this hack by calling
the recently added generic ide_init_ioport(), which
doesn't expect any ISADevice.
Inspired-by: Bernhard Beschow <shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/ide/piix.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 91424e5249..2136895401 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -138,7 +138,6 @@ static bool pci_piix_init_bus(PCIIDEState *d, unsigned i,
Error **errp)
{0x1f0, 0x3f6},
{0x170, 0x376},
};
- int ret;
if (!d->isa_irq[i]) {
error_setg(errp, "output IDE IRQ %u not connected", i);
@@ -146,13 +145,9 @@ static bool pci_piix_init_bus(PCIIDEState *d, unsigned i,
Error **errp)
}
ide_bus_init(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2);
- ret = ide_bus_init_ioport_isa(&d->bus[i], NULL, port_info[i].iobase,
- port_info[i].iobase2);
- if (ret) {
- error_setg_errno(errp, -ret, "Failed to realize %s port %u",
- object_get_typename(OBJECT(d)), i);
- return false;
- }
+ ide_bus_init_ioport(&d->bus[i], OBJECT(d),
+ pci_address_space_io(PCI_DEVICE(d)),
+ port_info[i].iobase, port_info[i].iobase2);
ide_bus_init_output_irq(&d->bus[i], d->isa_irq[i]);
bmdma_init(&d->bus[i], &d->bmdma[i], d);
--
2.38.1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH v3 09/18] hw/ide/piix: Use generic ide_bus_init_ioport(),
Philippe Mathieu-Daudé <=