]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
via-ide: Avoid using isa_get_irq()
authorBALATON Zoltan <balaton@eik.bme.hu>
Fri, 15 Oct 2021 01:06:20 +0000 (03:06 +0200)
committerPhilippe Mathieu-Daudé <f4bug@amsat.org>
Sun, 17 Oct 2021 22:41:36 +0000 (00:41 +0200)
Use via_isa_set_irq() which better encapsulates irq handling in the
vt82xx model and avoids using isa_get_irq() that has a comment saying
it should not be used.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <26cb1848c9fc0360df7a57c2c9ba5e03c4a692b5.1634259980.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
hw/ide/via.c

index e91dad632a99c66a119c2552351f6603a9ade923..82def819c411757cabe6ce77888b321e413564d2 100644 (file)
@@ -29,7 +29,7 @@
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "sysemu/dma.h"
-
+#include "hw/isa/vt82c686.h"
 #include "hw/ide/pci.h"
 #include "trace.h"
 
@@ -112,7 +112,7 @@ static void via_ide_set_irq(void *opaque, int n, int level)
         d->config[0x70 + n * 8] &= ~0x80;
     }
 
-    qemu_set_irq(isa_get_irq(NULL, 14 + n), level);
+    via_isa_set_irq(pci_get_function_0(d), 14 + n, level);
 }
 
 static void via_ide_reset(DeviceState *dev)