Skip to contentSkip to conversation

isa: Resolve unneeded IRQ attributes from ISADevice

PATCH Superseded Bernhard Beschow 2 participants 25 messages Feb 22, 2022

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover isa: Resolve unneeded IRQ attributes from ISADevice

The IRQ attributes of ISADevice are hardcoded to support up to two IRQs per device which creates an artificial limit. By not having the attributes in the first place, this limitation can be avoided altogether.

The IRQ attributes are mostly used for printing ('info qtree') and there is one user, hw/ppc/pnv, to use the attributes directly. As it turns out, the printing is redundant if the IRQ numbers are exposed as QOM properties and hw/ppc/pnv can be easily ported away.

The patch series is structured as follows: Patch 1-3 QOM'ify the last devices which rely on printing their IRQ numbers via the ISADevice attributes. Patch 4 and 5 remove the last users of the ISADevice attributes such that they can be removed in patch 6. The remainder of the patch series is cleanup.

Patch 6 turns isa_init_irq() into a trivial wrapper for isa_get_irq(). That is, the former function becomes redundant. All users are therefore converted to use isa_get_irq() directly. Finally, the last patch removes the now unused isa_init_irq().

Bernhard Beschow (22):
hw/rtc/mc146818rtc: QOM'ify IRQ number hw/rtc/m48t59-isa: QOM'ify IRQ number hw/input/pckbd: QOM'ify IRQ numbers hw/isa/isa-bus: Remove isabus_dev_print() hw/ppc/pnv: Determine ns16550's IRQ number from QOM property
isa: Drop unused attributes from ISADevice hw/audio/cs4231a: Disuse isa_init_irq() hw/audio/gus: Disuse isa_init_irq()
hw/audio/sb16: Disuse isa_init_irq() hw/block/fdc-isa: Disuse isa_init_irq() hw/char/parallel: Disuse isa_init_irq() hw/char/serial-isa: Disuse isa_init_irq() hw/ide/isa: Disuse isa_init_irq()
hw/input/pckbd: Disuse isa_init_irq() hw/ipmi/isa_ipmi_bt: Disuse isa_init_irq() hw/ipmi/isa_ipmi_kcs: Disuse isa_init_irq() hw/isa/piix4: Disuse isa_init_irq() hw/net/ne2000-isa: Disuse isa_init_irq() hw/rtc/m48t59-isa: Disuse isa_init_irq() hw/tpm/tpm_tis_isa: Disuse isa_init_irq() hw/isa/isa-bus: Disuse isa_init_irq()
isa: Remove unused isa_init_irq()

 hw/audio/cs4231a.c           |  2 +-
 hw/audio/gus.c               |  2 +-
 hw/audio/sb16.c              |  2 +-
 hw/block/fdc-isa.c           |  2 +-
 hw/char/parallel.c           |  2 +-
 hw/char/serial-isa.c         |  2 +-
 hw/ide/isa.c                 |  2 +-
 hw/input/pckbd.c             | 13 +++++++++----
 hw/ipmi/isa_ipmi_bt.c        |  2 +-
 hw/ipmi/isa_ipmi_kcs.c       |  2 +-
 hw/isa/isa-bus.c             | 37 +-----------------------------------
 hw/isa/piix4.c               |  2 +-
 hw/net/ne2000-isa.c          |  2 +-
 hw/ppc/pnv.c                 |  5 ++++-
 hw/rtc/m48t59-isa.c          |  4 +++-
 hw/rtc/mc146818rtc.c         |  8 ++++++--
 hw/tpm/tpm_tis_isa.c         |  2 +-
 include/hw/isa/isa.h         |  3 ---
 include/hw/rtc/mc146818rtc.h |  1 +
 tests/qemu-iotests/172.out   | 26 -------------------------
 20 files changed, 36 insertions(+), 85 deletions(-)
Signature · 1 line
2.35.1
#1 lore raw

PATCH 1/22 hw/rtc/mc146818rtc: QOM'ify IRQ number

Exposing the IRQ number as a QOM property not only allows it to be configurable but also to be printed by standard QOM mechanisms. This allows isabus_dev_print() to be retired eventually.

---
 hw/isa/piix4.c               | 2 +-
 hw/rtc/mc146818rtc.c         | 8 ++++++--
 include/hw/rtc/mc146818rtc.h | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)
hw/isa/piix4.c +1 -1
index 0fe7b69bc4..cb291d121c 100644
@@ -197,7 +197,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, RTC_ISA_IRQ);
+    isa_init_irq(ISA_DEVICE(&s->rtc), &s->rtc.irq, s->rtc.isairq);
 
     piix4_dev = dev;
 }
hw/rtc/mc146818rtc.c +6 -2
index e61a0cced4..f300f40257 100644
@@ -956,15 +956,17 @@ ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq)
 {
     DeviceState *dev;
     ISADevice *isadev;
+    RTCState *s;
 
     isadev = isa_new(TYPE_MC146818_RTC);
     dev = DEVICE(isadev);
+    s = MC146818_RTC(isadev);
     qdev_prop_set_int32(dev, "base_year", base_year);
     isa_realize_and_unref(isadev, bus, &error_fatal);
     if (intercept_irq) {
         qdev_connect_gpio_out(dev, 0, intercept_irq);
     } else {
-        isa_connect_gpio_out(isadev, 0, RTC_ISA_IRQ);
+        isa_connect_gpio_out(isadev, 0, s->isairq);
     }
 
     object_property_add_alias(qdev_get_machine(), "rtc-time", OBJECT(isadev),
@@ -975,6 +977,7 @@ ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq)
 
 static Property mc146818rtc_properties[] = {
     DEFINE_PROP_INT32("base_year", RTCState, base_year, 1980),
+    DEFINE_PROP_UINT32("irq", RTCState, isairq, RTC_ISA_IRQ),
     DEFINE_PROP_LOSTTICKPOLICY("lost_tick_policy", RTCState,
                                lost_tick_policy, LOST_TICK_POLICY_DISCARD),
     DEFINE_PROP_END_OF_LIST(),
@@ -1010,6 +1013,7 @@ static void rtc_reset_hold(Object *obj)
 
 static void rtc_build_aml(ISADevice *isadev, Aml *scope)
 {
+    RTCState *s = MC146818_RTC(isadev);
     Aml *dev;
     Aml *crs;
 
@@ -1020,7 +1024,7 @@ static void rtc_build_aml(ISADevice *isadev, Aml *scope)
     crs = aml_resource_template();
     aml_append(crs, aml_io(AML_DECODE16, RTC_ISA_BASE, RTC_ISA_BASE,
                            0x01, 0x08));
-    aml_append(crs, aml_irq_no_flags(RTC_ISA_IRQ));
+    aml_append(crs, aml_irq_no_flags(s->isairq));
 
     dev = aml_device("RTC");
     aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0B00")));
include/hw/rtc/mc146818rtc.h +1 -0
index 5b45b22924..c7586589ad 100644
@@ -26,6 +26,7 @@ struct RTCState {
     uint8_t cmos_data[128];
     uint8_t cmos_index;
     int32_t base_year;
+    uint32_t isairq;
     uint64_t base_rtc;
     uint64_t last_update;
     int64_t offset;
Signature · 1 line
2.35.1
#2 lore raw

PATCH 2/22 hw/rtc/m48t59-isa: QOM'ify IRQ number

In reply to Bernhard Beschow

Exposing the IRQ number as a QOM property not only allows it to be configurable but also to be printed by standard QOM mechanisms. This allows isabus_dev_print() to be retired eventually.

---
 hw/rtc/m48t59-isa.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
hw/rtc/m48t59-isa.c +3 -1
index dc21fb10a5..d1c1d789a5 100644
@@ -42,6 +42,7 @@ struct M48txxISAState {
     ISADevice parent_obj;
     M48t59State state;
     uint32_t io_base;
+    uint32_t isairq;
     MemoryRegion io;
 };
 
@@ -79,6 +80,7 @@ static void m48txx_isa_toggle_lock(Nvram *obj, int lock)
 static Property m48t59_isa_properties[] = {
     DEFINE_PROP_INT32("base-year", M48txxISAState, state.base_year, 0),
     DEFINE_PROP_UINT32("iobase", M48txxISAState, io_base, 0x74),
+    DEFINE_PROP_UINT32("irq", M48txxISAState, isairq, 8),
     DEFINE_PROP_END_OF_LIST(),
 };
 
@@ -99,7 +101,7 @@ static void m48t59_isa_realize(DeviceState *dev, Error **errp)
 
     s->model = u->info.model;
     s->size = u->info.size;
-    isa_init_irq(isadev, &s->IRQ, 8);
+    isa_init_irq(isadev, &s->IRQ, d->isairq);
     m48t59_realize_common(s, errp);
     memory_region_init_io(&d->io, OBJECT(dev), &m48t59_io_ops, s, "m48t59", 4);
     if (d->io_base != 0) {
Signature · 1 line
2.35.1
#3 lore raw

Re: [PATCH 02/22] hw/rtc/m48t59-isa: QOM'ify IRQ number

Quoted 40 lines · Bernhard Beschow

Exposing the IRQ number as a QOM property not only allows it to be configurable but also to be printed by standard QOM mechanisms. This allows isabus_dev_print() to be retired eventually.

---
 hw/rtc/m48t59-isa.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
hw/rtc/m48t59-isa.c +3 -2
index dc21fb10a5..d1c1d789a5 100644
@@ -42,6 +42,7 @@ struct M48txxISAState {
     ISADevice parent_obj;
     M48t59State state;
     uint32_t io_base;
+    uint32_t isairq;
     MemoryRegion io;
 };
 
@@ -79,6 +80,7 @@ static void m48txx_isa_toggle_lock(Nvram *obj, int lock)
 static Property m48t59_isa_properties[] = {
     DEFINE_PROP_INT32("base-year", M48txxISAState, state.base_year, 0),
     DEFINE_PROP_UINT32("iobase", M48txxISAState, io_base, 0x74),
+    DEFINE_PROP_UINT32("irq", M48txxISAState, isairq, 8),
     DEFINE_PROP_END_OF_LIST(),
 };
 
@@ -99,7 +101,7 @@ static void m48t59_isa_realize(DeviceState *dev, Error **errp)
 
     s->model = u->info.model;
     s->size = u->info.size;
-    isa_init_irq(isadev, &s->IRQ, 8);
+    isa_init_irq(isadev, &s->IRQ, d->isairq);
     m48t59_realize_common(s, errp);
     memory_region_init_io(&d->io, OBJECT(dev), &m48t59_io_ops, s, "m48t59", 4);
     if (d->io_base != 0) {
--
Quoted 1 line

2.35.1

If the user creates the device specifying irq=16 then isa_init_irq() will assert. Since these devices are creatable by users on the commandline, I think the realize method should check that the property value is in range (d->isairq < ISA_NUM_IRQS), and report a suitable error back if not.

thanks
-- PMM

#4 lore raw

Re: [PATCH 02/22] hw/rtc/m48t59-isa: QOM'ify IRQ number

Am 22. Februar 2022 17:47:56 UTC schrieb Peter Maydell <[email protected]>:

Quoted 33 lines · Bernhard Beschow
Quoted 32 lines

Exposing the IRQ number as a QOM property not only allows it to be configurable but also to be printed by standard QOM mechanisms. This allows isabus_dev_print() to be retired eventually.

---
 hw/rtc/m48t59-isa.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
hw/rtc/m48t59-isa.c +2 -0
index dc21fb10a5..d1c1d789a5 100644
@@ -42,6 +42,7 @@ struct M48txxISAState {
     ISADevice parent_obj;
     M48t59State state;
     uint32_t io_base;
+    uint32_t isairq;
     MemoryRegion io;
 };
 
@@ -79,6 +80,7 @@ static void m48txx_isa_toggle_lock(Nvram *obj, int lock)
 static Property m48t59_isa_properties[] = {
     DEFINE_PROP_INT32("base-year", M48txxISAState, state.base_year, 0),
     DEFINE_PROP_UINT32("iobase", M48txxISAState, io_base, 0x74),
+    DEFINE_PROP_UINT32("irq", M48txxISAState, isairq, 8),
     DEFINE_PROP_END_OF_LIST(),
 };
 
@@ -99,7 +101,7 @@ static void m48t59_isa_realize(DeviceState *dev, Error **errp)
 
Quoted 15 lines
Quoted 9 lines
hw/rtc/m48t59-isa.c +1 -2
     s->model = u->info.model;
     s->size = u->info.size;
-    isa_init_irq(isadev, &s->IRQ, 8);
+    isa_init_irq(isadev, &s->IRQ, d->isairq);
     m48t59_realize_common(s, errp);
     memory_region_init_io(&d->io, OBJECT(dev), &m48t59_io_ops, s, "m48t59", 4);
     if (d->io_base != 0) {
--

2.35.1

If the user creates the device specifying irq=16 then isa_init_irq() will assert. Since these devices are creatable by users on the commandline, I think the realize method should check that the property value is in range (d->isairq < ISA_NUM_IRQS), and report a suitable error back if not.

Ah, I missed that! Thanks for pointing out, I will fix it.

Regards,
Bernhard

Quoted 3 lines

thanks
-- PMM

#5 lore raw

PATCH 3/22 hw/input/pckbd: QOM'ify IRQ numbers

In reply to Bernhard Beschow

Exposing the IRQ numbers as a QOM properties not only allows them to be configurable but also to be printed by standard QOM mechanisms. This allows isabus_dev_print() to be retired eventually.

---
 hw/input/pckbd.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
hw/input/pckbd.c +9 -4
index baba62f357..e56bee87d2 100644
@@ -671,6 +671,8 @@ struct ISAKBDState {
     KBDState kbd;
     bool kbd_throttle;
     MemoryRegion io[2];
+    uint32_t kbd_irq;
+    uint32_t mouse_irq;
 };
 
 void i8042_isa_mouse_fake_event(ISAKBDState *isa)
@@ -734,8 +736,8 @@ static void i8042_realizefn(DeviceState *dev, Error **errp)
     ISAKBDState *isa_s = I8042(dev);
     KBDState *s = &isa_s->kbd;
 
-    isa_init_irq(isadev, &s->irq_kbd, 1);
-    isa_init_irq(isadev, &s->irq_mouse, 12);
+    isa_init_irq(isadev, &s->irq_kbd, isa_s->kbd_irq);
+    isa_init_irq(isadev, &s->irq_mouse, isa_s->mouse_irq);
 
     isa_register_ioport(isadev, isa_s->io + 0, 0x60);
     isa_register_ioport(isadev, isa_s->io + 1, 0x64);
@@ -754,6 +756,7 @@ static void i8042_realizefn(DeviceState *dev, Error **errp)
 
 static void i8042_build_aml(ISADevice *isadev, Aml *scope)
 {
+    ISAKBDState *isa_s = I8042(isadev);
     Aml *kbd;
     Aml *mou;
     Aml *crs;
@@ -761,7 +764,7 @@ static void i8042_build_aml(ISADevice *isadev, Aml *scope)
     crs = aml_resource_template();
     aml_append(crs, aml_io(AML_DECODE16, 0x0060, 0x0060, 0x01, 0x01));
     aml_append(crs, aml_io(AML_DECODE16, 0x0064, 0x0064, 0x01, 0x01));
-    aml_append(crs, aml_irq_no_flags(1));
+    aml_append(crs, aml_irq_no_flags(isa_s->kbd_irq));
 
     kbd = aml_device("KBD");
     aml_append(kbd, aml_name_decl("_HID", aml_eisaid("PNP0303")));
@@ -769,7 +772,7 @@ static void i8042_build_aml(ISADevice *isadev, Aml *scope)
     aml_append(kbd, aml_name_decl("_CRS", crs));
 
     crs = aml_resource_template();
-    aml_append(crs, aml_irq_no_flags(12));
+    aml_append(crs, aml_irq_no_flags(isa_s->mouse_irq));
 
     mou = aml_device("MOU");
     aml_append(mou, aml_name_decl("_HID", aml_eisaid("PNP0F13")));
@@ -783,6 +786,8 @@ static void i8042_build_aml(ISADevice *isadev, Aml *scope)
 static Property i8042_properties[] = {
     DEFINE_PROP_BOOL("extended-state", ISAKBDState, kbd.extended_state, true),
     DEFINE_PROP_BOOL("kbd-throttle", ISAKBDState, kbd_throttle, false),
+    DEFINE_PROP_UINT32("kbd-irq", ISAKBDState, kbd_irq, 1),
+    DEFINE_PROP_UINT32("mouse-irq", ISAKBDState, mouse_irq, 12),
     DEFINE_PROP_END_OF_LIST(),
 };
 
Signature · 1 line
2.35.1
#6 lore raw

PATCH 4/22 hw/isa/isa-bus: Remove isabus_dev_print()

In reply to Bernhard Beschow

All isabus_dev_print() did was to print up to two IRQ numbers per device. This is redundant if the IRQ numbers are present as QOM properties (see e.g. the modified tests/qemu-iotests/172.out).

Now that the last devices relying on isabus_dev_print() had their IRQ numbers QOM'ified, the contribution of this function ultimately became redundant. Remove it.

---
 hw/isa/isa-bus.c           | 16 ----------------
 tests/qemu-iotests/172.out | 26 --------------------------
 2 files changed, 42 deletions(-)
hw/isa/isa-bus.c +0 -16
index 6c31398dda..af5add6a26 100644
@@ -21,21 +21,18 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "monitor/monitor.h"
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "hw/isa/isa.h"
 
 static ISABus *isabus;
 
-static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent);
 static char *isabus_get_fw_dev_path(DeviceState *dev);
 
 static void isa_bus_class_init(ObjectClass *klass, void *data)
 {
     BusClass *k = BUS_CLASS(klass);
 
-    k->print_dev = isabus_dev_print;
     k->get_fw_dev_path = isabus_get_fw_dev_path;
 }
 
@@ -222,19 +219,6 @@ void isa_build_aml(ISABus *bus, Aml *scope)
     }
 }
 
-static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent)
-{
-    ISADevice *d = ISA_DEVICE(dev);
-
-    if (d->isairq[1] != -1) {
-        monitor_printf(mon, "%*sisa irqs %d,%d\n", indent, "",
-                       d->isairq[0], d->isairq[1]);
-    } else if (d->isairq[0] != -1) {
-        monitor_printf(mon, "%*sisa irq %d\n", indent, "",
-                       d->isairq[0]);
-    }
-}
-
 static void isabus_bridge_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
tests/qemu-iotests/172.out +0 -26
index 4cf4d536b4..9479b92185 100644
@@ -15,7 +15,6 @@ Testing:
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -43,7 +42,6 @@ Testing: -fda TEST_DIR/t.qcow2
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -81,7 +79,6 @@ Testing: -fdb TEST_DIR/t.qcow2
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -135,7 +132,6 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -190,7 +186,6 @@ Testing: -fdb
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -230,7 +225,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -268,7 +262,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -322,7 +315,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -380,7 +372,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -418,7 +409,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,unit=1
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -456,7 +446,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -520,7 +509,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -575,7 +563,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -630,7 +617,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -685,7 +671,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -749,7 +734,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -804,7 +788,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -865,7 +848,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -global floppy.drive=none0 -device
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -933,7 +915,6 @@ Testing: -device floppy
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -958,7 +939,6 @@ Testing: -device floppy,drive-type=120
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -983,7 +963,6 @@ Testing: -device floppy,drive-type=144
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -1008,7 +987,6 @@ Testing: -device floppy,drive-type=288
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -1036,7 +1014,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -1074,7 +1051,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -1115,7 +1091,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,logical
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
@@ -1153,7 +1128,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physica
             fdtypeA = "auto"
             fdtypeB = "auto"
             fallback = "288"
-            isa irq 6
             bus: floppy-bus.0
               type floppy-bus
               dev: floppy, id ""
Signature · 1 line
2.35.1
#7 lore raw

PATCH 5/22 hw/ppc/pnv: Determine ns16550's IRQ number from QOM property

In reply to Bernhard Beschow

Determine the IRQ number in the same way as for isa-ipmi-bt. This resolves the last usage of ISADevice::isairq[] which allows it to be removed.

---
 hw/ppc/pnv.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
hw/ppc/pnv.c +4 -1
index 837146a2fb..1e9f6b0690 100644
@@ -380,9 +380,12 @@ static void pnv_dt_serial(ISADevice *d, void *fdt, int lpc_off)
         cpu_to_be32(io_base),
         cpu_to_be32(8)
     };
+    uint32_t irq;
     char *name;
     int node;
 
+    irq = object_property_get_int(OBJECT(d), "irq", &error_fatal);
+
     name = g_strdup_printf("%s@i%x", qdev_fw_name(DEVICE(d)), io_base);
     node = fdt_add_subnode(fdt, lpc_off, name);
     _FDT(node);
@@ -394,7 +397,7 @@ static void pnv_dt_serial(ISADevice *d, void *fdt, int lpc_off)
 
     _FDT((fdt_setprop_cell(fdt, node, "clock-frequency", 1843200)));
     _FDT((fdt_setprop_cell(fdt, node, "current-speed", 115200)));
-    _FDT((fdt_setprop_cell(fdt, node, "interrupts", d->isairq[0])));
+    _FDT((fdt_setprop_cell(fdt, node, "interrupts", irq)));
     _FDT((fdt_setprop_cell(fdt, node, "interrupt-parent",
                            fdt_get_phandle(fdt, lpc_off))));
 
Signature · 1 line
2.35.1
#8 lore raw

PATCH 6/22 isa: Drop unused attributes from ISADevice

In reply to Bernhard Beschow

Now that the last users of ISADevice::isairq[] have been resolved during the previous commits, it can be removed for good.

---
 hw/isa/isa-bus.c     | 13 -------------
 include/hw/isa/isa.h |  2 --
 2 files changed, 15 deletions(-)
hw/isa/isa-bus.c +0 -13
index af5add6a26..c64a14120b 100644
@@ -87,11 +87,7 @@ qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq)
 
 void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq)
 {
-    assert(dev->nirqs < ARRAY_SIZE(dev->isairq));
-    assert(isairq < ISA_NUM_IRQS);
-    dev->isairq[dev->nirqs] = isairq;
     *p = isa_get_irq(dev, isairq);
-    dev->nirqs++;
 }
 
 void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq)
@@ -150,14 +146,6 @@ int isa_register_portio_list(ISADevice *dev,
     return 0;
 }
 
-static void isa_device_init(Object *obj)
-{
-    ISADevice *dev = ISA_DEVICE(obj);
-
-    dev->isairq[0] = -1;
-    dev->isairq[1] = -1;
-}
-
 ISADevice *isa_new(const char *name)
 {
     return ISA_DEVICE(qdev_new(name));
@@ -244,7 +232,6 @@ static const TypeInfo isa_device_type_info = {
     .name = TYPE_ISA_DEVICE,
     .parent = TYPE_DEVICE,
     .instance_size = sizeof(ISADevice),
-    .instance_init = isa_device_init,
     .abstract = true,
     .class_size = sizeof(ISADeviceClass),
     .class_init = isa_device_class_init,
include/hw/isa/isa.h +0 -2
index d4417b34b6..d80cab5b79 100644
@@ -83,8 +83,6 @@ struct ISADevice {
     DeviceState parent_obj;
     /*< public >*/
 
-    int8_t isairq[2];      /* -1 = unassigned */
-    int nirqs;
     int ioport_id;
 };
 
Signature · 1 line
2.35.1
#9 lore raw

PATCH 7/22 hw/audio/cs4231a: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/audio/cs4231a.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/audio/cs4231a.c +1 -1
index 7d60ce6f0e..0723e39430 100644
@@ -677,7 +677,7 @@ static void cs4231a_realizefn (DeviceState *dev, Error **errp)
         return;
     }
 
-    isa_init_irq(d, &s->pic, s->irq);
+    s->pic = isa_get_irq(d, s->irq);
     k = ISADMA_GET_CLASS(s->isa_dma);
     k->register_channel(s->isa_dma, s->dma, cs_dma_read, s);
 
Signature · 1 line
2.35.1
#10 lore raw

PATCH 8/22 hw/audio/gus: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/audio/gus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/audio/gus.c +1 -1
index e8719ee117..42f010b671 100644
@@ -282,7 +282,7 @@ static void gus_realizefn (DeviceState *dev, Error **errp)
     s->emu.himemaddr = s->himem;
     s->emu.gusdatapos = s->emu.himemaddr + 1024 * 1024 + 32;
     s->emu.opaque = s;
-    isa_init_irq (d, &s->pic, s->emu.gusirq);
+    s->pic = isa_get_irq(d, s->emu.gusirq);
 
     AUD_set_active_out (s->voice, 1);
 }
Signature · 1 line
2.35.1
#11 lore raw

PATCH 9/22 hw/audio/sb16: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/audio/sb16.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/audio/sb16.c +1 -1
index 60f1f75e3a..2215386ddb 100644
@@ -1408,7 +1408,7 @@ static void sb16_realizefn (DeviceState *dev, Error **errp)
         return;
     }
 
-    isa_init_irq (isadev, &s->pic, s->irq);
+    s->pic = isa_get_irq(isadev, s->irq);
 
     s->mixer_regs[0x80] = magic_of_irq (s->irq);
     s->mixer_regs[0x81] = (1 << s->dma) | (1 << s->hdma);
Signature · 1 line
2.35.1
#12 lore raw

PATCH 10/22 hw/block/fdc-isa: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/block/fdc-isa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/block/fdc-isa.c +1 -1
index ab663dce93..fa20450747 100644
@@ -94,7 +94,7 @@ static void isabus_fdc_realize(DeviceState *dev, Error **errp)
                              isa->iobase, fdc_portio_list, fdctrl,
                              "fdc");
 
-    isa_init_irq(isadev, &fdctrl->irq, isa->irq);
+    fdctrl->irq = isa_get_irq(isadev, isa->irq);
     fdctrl->dma_chann = isa->dma;
     if (fdctrl->dma_chann != -1) {
         IsaDmaClass *k;
Signature · 1 line
2.35.1
#13 lore raw

PATCH 11/22 hw/char/parallel: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/char/parallel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/char/parallel.c +1 -1
index b45e67bfbb..adb9bd9be3 100644
@@ -553,7 +553,7 @@ static void parallel_isa_realizefn(DeviceState *dev, Error **errp)
     index++;
 
     base = isa->iobase;
-    isa_init_irq(isadev, &s->irq, isa->isairq);
+    s->irq = isa_get_irq(isadev, isa->isairq);
     qemu_register_reset(parallel_reset, s);
 
     qemu_chr_fe_set_handlers(&s->chr, parallel_can_receive, NULL,
Signature · 1 line
2.35.1
#14 lore raw

PATCH 12/22 hw/char/serial-isa: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/char/serial-isa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/char/serial-isa.c +1 -1
index 1b8b303079..7a7ed239cd 100644
@@ -75,7 +75,7 @@ static void serial_isa_realizefn(DeviceState *dev, Error **errp)
     }
     index++;
 
-    isa_init_irq(isadev, &s->irq, isa->isairq);
+    s->irq = isa_get_irq(isadev, isa->isairq);
     qdev_realize(DEVICE(s), NULL, errp);
     qdev_set_legacy_instance_id(dev, isa->iobase, 3);
 
Signature · 1 line
2.35.1
#15 lore raw

PATCH 13/22 hw/ide/isa: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/ide/isa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ide/isa.c +1 -1
index 24bbde24c2..8bedbd13f1 100644
@@ -75,7 +75,7 @@ static void isa_ide_realizefn(DeviceState *dev, Error **errp)
 
     ide_bus_init(&s->bus, sizeof(s->bus), dev, 0, 2);
     ide_init_ioport(&s->bus, isadev, s->iobase, s->iobase2);
-    isa_init_irq(isadev, &s->irq, s->isairq);
+    s->irq = isa_get_irq(isadev, s->isairq);
     ide_init2(&s->bus, s->irq);
     vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_isa, s);
     ide_register_restart_cb(&s->bus);
Signature · 1 line
2.35.1
#16 lore raw

PATCH 14/22 hw/input/pckbd: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/input/pckbd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/input/pckbd.c +2 -2
index e56bee87d2..3ee36baf2d 100644
@@ -736,8 +736,8 @@ static void i8042_realizefn(DeviceState *dev, Error **errp)
     ISAKBDState *isa_s = I8042(dev);
     KBDState *s = &isa_s->kbd;
 
-    isa_init_irq(isadev, &s->irq_kbd, isa_s->kbd_irq);
-    isa_init_irq(isadev, &s->irq_mouse, isa_s->mouse_irq);
+    s->irq_kbd = isa_get_irq(isadev, isa_s->kbd_irq);
+    s->irq_mouse = isa_get_irq(isadev, isa_s->mouse_irq);
 
     isa_register_ioport(isadev, isa_s->io + 0, 0x60);
     isa_register_ioport(isadev, isa_s->io + 1, 0x64);
Signature · 1 line
2.35.1
#17 lore raw

PATCH 15/22 hw/ipmi/isa_ipmi_bt: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/ipmi/isa_ipmi_bt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ipmi/isa_ipmi_bt.c +1 -1
index 02625eb94e..88aa734e9e 100644
@@ -92,7 +92,7 @@ static void isa_ipmi_bt_realize(DeviceState *dev, Error **errp)
     }
 
     if (iib->isairq > 0) {
-        isa_init_irq(isadev, &iib->irq, iib->isairq);
+        iib->irq = isa_get_irq(isadev, iib->isairq);
         iib->bt.use_irq = 1;
         iib->bt.raise_irq = isa_ipmi_bt_raise_irq;
         iib->bt.lower_irq = isa_ipmi_bt_lower_irq;
Signature · 1 line
2.35.1
#18 lore raw

PATCH 16/22 hw/ipmi/isa_ipmi_kcs: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/ipmi/isa_ipmi_kcs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ipmi/isa_ipmi_kcs.c +1 -1
index 3b23ad08b3..afabb95ebe 100644
@@ -91,7 +91,7 @@ static void ipmi_isa_realize(DeviceState *dev, Error **errp)
     }
 
     if (iik->isairq > 0) {
-        isa_init_irq(isadev, &iik->irq, iik->isairq);
+        iik->irq = isa_get_irq(isadev, iik->isairq);
         iik->kcs.use_irq = 1;
         iik->kcs.raise_irq = isa_ipmi_kcs_raise_irq;
         iik->kcs.lower_irq = isa_ipmi_kcs_lower_irq;
Signature · 1 line
2.35.1
#19 lore raw

PATCH 17/22 hw/isa/piix4: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/isa/piix4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/isa/piix4.c +1 -1
index cb291d121c..0fd6756dcf 100644
@@ -197,7 +197,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);
 
     piix4_dev = dev;
 }
Signature · 1 line
2.35.1
#20 lore raw

PATCH 18/22 hw/net/ne2000-isa: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/net/ne2000-isa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/net/ne2000-isa.c +1 -1
index dd6f6e34d3..6ced6775ff 100644
@@ -68,7 +68,7 @@ static void isa_ne2000_realizefn(DeviceState *dev, Error **errp)
     ne2000_setup_io(s, DEVICE(isadev), 0x20);
     isa_register_ioport(isadev, &s->io, isa->iobase);
 
-    isa_init_irq(isadev, &s->irq, isa->isairq);
+    s->irq = isa_get_irq(isadev, isa->isairq);
 
     qemu_macaddr_default_if_unset(&s->c.macaddr);
     ne2000_reset(s);
Signature · 1 line
2.35.1
#21 lore raw

PATCH 19/22 hw/rtc/m48t59-isa: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/rtc/m48t59-isa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/rtc/m48t59-isa.c +1 -1
index d1c1d789a5..31918c416f 100644
@@ -101,7 +101,7 @@ static void m48t59_isa_realize(DeviceState *dev, Error **errp)
 
     s->model = u->info.model;
     s->size = u->info.size;
-    isa_init_irq(isadev, &s->IRQ, d->isairq);
+    s->IRQ = isa_get_irq(isadev, d->isairq);
     m48t59_realize_common(s, errp);
     memory_region_init_io(&d->io, OBJECT(dev), &m48t59_io_ops, s, "m48t59", 4);
     if (d->io_base != 0) {
Signature · 1 line
2.35.1
#22 lore raw

PATCH 20/22 hw/tpm/tpm_tis_isa: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/tpm/tpm_tis_isa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/tpm/tpm_tis_isa.c +1 -1
index 10d8a14f19..3477afd735 100644
@@ -127,7 +127,7 @@ static void tpm_tis_isa_realizefn(DeviceState *dev, Error **errp)
         return;
     }
 
-    isa_init_irq(ISA_DEVICE(dev), &s->irq, s->irq_num);
+    s->irq = isa_get_irq(ISA_DEVICE(dev), s->irq_num);
 
     memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
                                 TPM_TIS_ADDR_BASE, &s->mmio);
Signature · 1 line
2.35.1
#23 lore raw

PATCH 21/22 hw/isa/isa-bus: Disuse isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually.

---
 hw/isa/isa-bus.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
hw/isa/isa-bus.c +1 -2
index c64a14120b..1e8c102177 100644
@@ -92,8 +92,7 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq)
 
 void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq)
 {
-    qemu_irq irq;
-    isa_init_irq(isadev, &irq, isairq);
+    qemu_irq irq = isa_get_irq(isadev, isairq);
     qdev_connect_gpio_out(DEVICE(isadev), gpioirq, irq);
 }
 
Signature · 1 line
2.35.1
#24 lore raw

PATCH 22/22 isa: Remove unused isa_init_irq()

In reply to Bernhard Beschow

isa_init_irq() had become a trivial one-line wrapper for isa_get_irq(). The previous commits resolved all usages in favor of isa_get_irq(). isa_init_irq() can therefore be removed.

---
 hw/isa/isa-bus.c     | 5 -----
 include/hw/isa/isa.h | 1 -
 2 files changed, 6 deletions(-)
hw/isa/isa-bus.c +0 -5
index 1e8c102177..0ad1c5fd65 100644
@@ -85,11 +85,6 @@ qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq)
     return isabus->irqs[isairq];
 }
 
-void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq)
-{
-    *p = isa_get_irq(dev, isairq);
-}
-
 void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq)
 {
     qemu_irq irq = isa_get_irq(isadev, isairq);
include/hw/isa/isa.h +0 -1
index d80cab5b79..034d706ba1 100644
@@ -90,7 +90,6 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space,
                     MemoryRegion *address_space_io, Error **errp);
 void isa_bus_irqs(ISABus *bus, qemu_irq *irqs);
 qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq);
-void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq);
 void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq);
 void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16);
 IsaDma *isa_get_dma(ISABus *bus, int nchan);
Signature · 1 line
2.35.1