[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 08/10] hw/ide/piix: Use pci_ide_init_ioport() rather than isa
From: |
Bernhard Beschow |
Subject: |
[RFC PATCH 08/10] hw/ide/piix: Use pci_ide_init_ioport() rather than isa_ide_init_ioport() |
Date: |
Mon, 27 Jun 2022 09:16:09 +0200 |
This should fix the last caller causing a NULL ISADev to be passed to
isa_register_portio_list() which now allows for disusing the isabus global
there.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/ide/piix.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 312611c61f..087568ecf1 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -161,7 +161,7 @@ static int pci_piix_init_ports(PCIIDEState *d)
for (i = 0; i < 2; i++) {
ide_bus_init(&d->bus[i], sizeof(d->bus[i]), dev, i, 2);
- isa_ide_init_ioport(&d->bus[i], NULL, port_info[i].iobase,
+ pci_ide_init_ioport(&d->bus[i], PCI_DEVICE(d), port_info[i].iobase,
port_info[i].iobase2);
ide_init2(&d->bus[i], qdev_get_gpio_in(dev, i));
--
2.36.1
- [RFC PATCH 00/10] Resolve isabus global, Bernhard Beschow, 2022/06/27
- [RFC PATCH 02/10] Revert "hw/ide: Fix crash when plugging a piix3-ide device into the x-remote machine", Bernhard Beschow, 2022/06/27
- [RFC PATCH 10/10] hw/isa/isa-bus: Resolve isabus global, Bernhard Beschow, 2022/06/27
- [RFC PATCH 07/10] hw/pci/pci: Introduce pci_register_portio_list(), Bernhard Beschow, 2022/06/27
- [RFC PATCH 01/10] hw/ide/piix: Check for presence of ISABus before using it, Bernhard Beschow, 2022/06/27
- [RFC PATCH 03/10] hw/i386/pc_piix: Allow for setting properties on "piix3-ide" before realizing it, Bernhard Beschow, 2022/06/27
- [RFC PATCH 08/10] hw/ide/piix: Use pci_ide_init_ioport() rather than isa_ide_init_ioport(),
Bernhard Beschow <=
- [RFC PATCH 09/10] hw/isa: Resolve unneeded usage of isabus global, Bernhard Beschow, 2022/06/27
- [RFC PATCH 06/10] hw/ide/ioport: Rename ide_init_ioport() to isa_ide_init_ioport(), Bernhard Beschow, 2022/06/27
- [RFC PATCH 05/10] hw/isa/isa-bus: assert() if isa_get_irq() gets passed a NULL ISADevice, Bernhard Beschow, 2022/06/27
- [RFC PATCH 04/10] hw/ide/piix: Avoid the isabus global when wiring ISA interrupts for internal devices, Bernhard Beschow, 2022/06/27