From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Wed, 24 Mar 2021 14:24:41 +0000 (+0100)
Subject: hw/isa/piix4: Use qdev_get_gpio_in_named() to get ISA IRQ
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bcad139192b0101e3d7ef593144c314bed4cb8c2;p=qemu.git

hw/isa/piix4: Use qdev_get_gpio_in_named() to get ISA IRQ

Since commit 078778c5a55 ("piix4: Add an i8259 Interrupt Controller")
the TYPE_PIIX4_PCI_DEVICE exposes the ISA input IRQs as "isa" alias.

Use this alias to get IRQ for the power management PCI function.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210324182902.692419-1-f4bug@amsat.org>
---

diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index b3b6a4378a..5ae3b4984d 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -268,8 +268,9 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus)
     pci_create_simple(pci_bus, devfn + 2, "piix4-usb-uhci");
     if (smbus) {
         *smbus = piix4_pm_init(pci_bus, devfn + 3, 0x1100,
-                               isa_get_irq(NULL, 9), NULL, 0, NULL);
-   }
+                               qdev_get_gpio_in_named(dev, "isa", 9),
+                               NULL, 0, NULL);
+    }
 
     return dev;
 }