[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/10] hw/ide/piix: Disuse isa_get_irq()
From: |
Bernhard Beschow |
Subject: |
[PATCH v2 04/10] hw/ide/piix: Disuse isa_get_irq() |
Date: |
Thu, 26 Jan 2023 22:17:34 +0100 |
isa_get_irq() asks for an ISADevice which piix-ide doesn't provide.
Passing a NULL pointer works but causes the isabus global to be used
then. By fishing out TYPE_ISA_BUS from the QOM tree it is possible to
achieve the same as isa_get_irq().
This is an alternative solution to commit 9405d87be25d 'hw/ide: Fix
crash when plugging a piix3-ide device into the x-remote machine' which
allows for cleaning up the ISA API while keeping PIIX IDE functions
user-createable.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/ide/piix.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 267dbf37db..a6646d9657 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -126,7 +126,7 @@ static void piix_ide_reset(DeviceState *dev)
pci_set_byte(pci_conf + 0x20, 0x01); /* BMIBA: 20-23h */
}
-static int pci_piix_init_ports(PCIIDEState *d)
+static int pci_piix_init_ports(PCIIDEState *d, ISABus *isa_bus)
{
static const struct {
int iobase;
@@ -145,7 +145,7 @@ static int pci_piix_init_ports(PCIIDEState *d)
if (ret) {
return ret;
}
- ide_init2(&d->bus[i], isa_get_irq(NULL, port_info[i].isairq));
+ ide_init2(&d->bus[i], isa_bus->irqs[port_info[i].isairq]);
bmdma_init(&d->bus[i], &d->bmdma[i], d);
d->bmdma[i].bus = &d->bus[i];
@@ -159,6 +159,8 @@ static void pci_piix_ide_realize(PCIDevice *dev, Error
**errp)
{
PCIIDEState *d = PCI_IDE(dev);
uint8_t *pci_conf = dev->config;
+ ISABus *isa_bus;
+ bool ambiguous;
int rc;
pci_conf[PCI_CLASS_PROG] = 0x80; // legacy ATA mode
@@ -168,7 +170,20 @@ static void pci_piix_ide_realize(PCIDevice *dev, Error
**errp)
vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_pci, d);
- rc = pci_piix_init_ports(d);
+ isa_bus = ISA_BUS(object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous));
+ if (ambiguous) {
+ error_setg(errp,
+ "More than one ISA bus found while %s supports only one",
+ object_get_typename(OBJECT(dev)));
+ return;
+ }
+ if (!isa_bus) {
+ error_setg(errp, "No ISA bus found while %s requires one",
+ object_get_typename(OBJECT(dev)));
+ return;
+ }
+
+ rc = pci_piix_init_ports(d, isa_bus);
if (rc) {
error_setg_errno(errp, -rc, "Failed to realize %s",
object_get_typename(OBJECT(dev)));
--
2.39.1
- [PATCH v2 00/10] Resolve isabus global, Bernhard Beschow, 2023/01/26
- [PATCH v2 01/10] softmmu/ioport: Move portio_list_init() in front of portio_list_add(), Bernhard Beschow, 2023/01/26
- [PATCH v2 04/10] hw/ide/piix: Disuse isa_get_irq(),
Bernhard Beschow <=
- [PATCH v2 10/10] hw/isa/isa-bus: Resolve isabus global, Bernhard Beschow, 2023/01/26
- [PATCH v2 06/10] hw/ide/pci: Add PCIIDEState::isa_irqs[], Bernhard Beschow, 2023/01/26
- [PATCH v2 02/10] softmmu/ioport: Merge portio_list_add() into portio_list_init(), Bernhard Beschow, 2023/01/26
- [PATCH v2 03/10] softmmu/ioport: Remove unused functions, Bernhard Beschow, 2023/01/26
- [PATCH v2 08/10] hw/ide: Let ide_init_ioport() take a MemoryRegion argument instead of ISADevice, Bernhard Beschow, 2023/01/26
- [PATCH v2 09/10] hw/isa: Remove use of global isa bus, Bernhard Beschow, 2023/01/26
- [PATCH v2 05/10] Revert "hw/ide: Fix crash when plugging a piix3-ide device into the x-remote machine", Bernhard Beschow, 2023/01/26
- [PATCH v2 07/10] hw/ide/piix: Require an ISABus only for user-created instances, Bernhard Beschow, 2023/01/26