From: Mark Cave-Ayland Date: Fri, 13 Mar 2020 08:24:44 +0000 (+0000) Subject: via-ide: always use legacy IRQ 14/15 routing X-Git-Tag: v5.0.0-rc0~22^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a519323d3e8425f0cf58fc85a346237edf8aeac;p=thirdparty%2Fqemu.git via-ide: always use legacy IRQ 14/15 routing The existing code uses fixed PCI IRQ routing on IRQ 14 rather than legacy IRQ 14/15 routing as documented in the datasheet. With the changes in this patchset guest OSs now correctly detect and configure the VIA controller in legacy IRQ routing mode, allowing the incorrect fixed PCI IRQ routing to be removed. Note that this fixed legacy IRQ 14/15 routing is identical to similar behaviour in the early PIIX IDE controllers. Signed-off-by: Mark Cave-Ayland Tested-by: BALATON Zoltan Signed-off-by: BALATON Zoltan Message-id: 20200313082444.2439-8-mark.cave-ayland@ilande.co.uk Signed-off-by: John Snow --- diff --git a/hw/ide/via.c b/hw/ide/via.c index 3c4d474e48b..8de4945cc12 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -113,10 +113,7 @@ static void via_ide_set_irq(void *opaque, int n, int level) } level = (d->config[0x70] & 0x80) || (d->config[0x78] & 0x80); - n = pci_get_byte(d->config + PCI_INTERRUPT_LINE); - if (n) { - qemu_set_irq(isa_get_irq(NULL, n), level); - } + qemu_set_irq(isa_get_irq(NULL, 14 + n), level); } static void via_ide_reset(DeviceState *dev)