On 7/3/22 12:29, Bernhard Beschow wrote:
Am 7. März 2022 10:12:06 UTC schrieb "Philippe Mathieu-Daudé"
<[email protected]>:
From: Bernhard Beschow <[email protected]>
isa_init_irq() has become a trivial one-line wrapper for isa_get_irq().
It can therefore be removed.
isa_ipmi_kcs)
Signed-off-by: Bernhard Beschow <[email protected]>
Reviewed-by: Stefan Berger <[email protected]> (tpm_tis_isa)
Acked-by: Corey Minyard <[email protected]> (isa_ipmi_bt,
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Acked-by: Gerd Hoffmann <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
---
hw/isa/piix4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index fc3c8b3fd1..8607e0ac36 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -216,7 +216,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp)
if (!qdev_realize(DEVICE(&s->rtc), BUS(isa_bus), errp)) {
return;
}
- isa_init_irq(ISA_DEVICE(&s->rtc), &s->rtc.irq, s->rtc.isairq);
+ s->rtc.irq = isa_get_irq(ISA_DEVICE(&s->rtc), s->rtc.isairq);
}
static void piix4_init(Object *obj)
Hey Phil,
it looks like the majority of the patch is missing (only the resolved merge
conflict is there). I can send this patch series rebased onto my Malta one
which I could do later this day.
Thanks for being careful and catching this. Not sure what I screwed.
Since I have this done locally I'll repost so you can verify.
Regards,
Phil.
