via-ide: Avoid using isa_get_irq()

zbalaton · philmd · commit 2792cf20ca7e · 2021-10-18T00:41:36.000+02:00
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 &lt;balaton@eik.bme.hu&gt;
Reviewed-by: Philippe Mathieu-Daudé &lt;f4bug@amsat.org&gt;
Message-Id: &lt;26cb1848c9fc0360df7a57c2c9ba5e03c4a692b5.1634259980.git.balaton@eik.bme.hu&gt;
Signed-off-by: Philippe Mathieu-Daudé &lt;f4bug@amsat.org&gt;
diff --git a/hw/ide/via.c b/hw/ide/via.c
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`#include "migration/vmstate.h"`
`30`	`30`	`#include "qemu/module.h"`
`31`	`31`	`#include "sysemu/dma.h"`
`32`		`-`
	`32`	`+#include "hw/isa/vt82c686.h"`
`33`	`33`	`#include "hw/ide/pci.h"`
`34`	`34`	`#include "trace.h"`
`35`	`35`
`@@ -112,7 +112,7 @@ static void via_ide_set_irq(void *opaque, int n, int level)`
`112`	`112`	`d->config[0x70 + n * 8] &= ~0x80;`
`113`	`113`	`}`
`114`	`114`
`115`		`- qemu_set_irq(isa_get_irq(NULL, 14 + n), level);`
	`115`	`+ via_isa_set_irq(pci_get_function_0(d), 14 + n, level);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`static void via_ide_reset(DeviceState *dev)`