Skip to content

isa: Resolve unneeded IRQ attributes from ISADevice

Bernhard Beschow qemu-devel 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest7 patches 3 repliesIn review
  2. v222 patches 15 repliesApplied
  3. v122 patches 2 repliesSuperseded

Changes in v3 from the cover letter

* Use DEFINE_PROP_UINT8 / uint8_t for new IRQ properties. (Philippe)
* Use "%u" format when printing maximum allowed IRQ number in error messages. (Philippe)
* Use object_property_get_uint() in pnv.c. (Philippe)
* Squash cleanup patches (7-22) into
"Inline and remove one-line isa_init_irq()" (Philippe)
* Mention in the commit message of patch 1 that mc146818rtc has its IRQ number now displayed in the human monitor. Since the IRQ numbers of the other "QOM'ified" devices were already displayed I've only adapted this commit message. (Philippe)

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7hw/rtc/mc146818rtc: QOM'ify IRQ numberhw/isa/piix4.c hw/rtc/mc146818rtc.c include/hw/rtc/mc146818rtc.h+13 -30 replies
2/7hw/rtc/m48t59-isa: QOM'ify IRQ numberhw/rtc/m48t59-isa.c+8 -10 replies
3/7hw/input/pckbd: QOM'ify IRQ numbershw/input/pckbd.c+22 -40 replies
4/7hw/isa/isa-bus: Remove isabus_dev_print()hw/isa/isa-bus.c tests/qemu-iotests/172.out+0 -420 replies
5/7hw/ppc/pnv: Determine ns16550's IRQ number from QOM propertyhw/ppc/pnv.c+4 -10 replies
6/7isa: Drop unused attributes from ISADevicehw/isa/isa-bus.c include/hw/isa/isa.h+0 -150 replies
7/7isa: Inline and remove one-line isa_init_irq()hw/audio/cs4231a.c hw/audio/gus.c hw/audio/sb16.c +13 more+16 -231 reply

Reviews trailers per patch

All 7 patches have a Reviewed-by or Acked-by.

PatchCédric Le GoaterPhilippe Mathieu-DaudéStefan BergerCorey MinyardGerd Hoffmann
1/7R-b
2/7R-b
3/7R-b
4/7R-b
5/7R-b R-b
6/7R-b
7/7R-b R-b A-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v3 thread

Cover letter [PATCH v3 0/7] isa: Resolve unneeded IRQ attributes from ISADevice

v3:
* Use DEFINE_PROP_UINT8 / uint8_t for new IRQ properties. (Philippe)
* Use "%u" format when printing maximum allowed IRQ number in error messages. (Philippe)
* Use object_property_get_uint() in pnv.c. (Philippe)
* Squash cleanup patches (7-22) into
"Inline and remove one-line isa_init_irq()" (Philippe)
* Mention in the commit message of patch 1 that mc146818rtc has its IRQ number now displayed in the human monitor. Since the IRQ numbers of the other "QOM'ified" devices were already displayed I've only adapted this commit message. (Philippe)

v2:
* The newly QOM'ified devices now report an error to the user in their realize functions if the configured IRQ number is greater than 15. (PMM)

v1:
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 (7):
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
isa: Inline and remove one-line 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             | 26 +++++++++++++++++++++----
 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          |  9 ++++++++-
 hw/rtc/mc146818rtc.c         | 13 +++++++++++--
 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, 59 insertions(+), 85 deletions(-)
Signature · 1 line
2.35.1