From: Philippe Mathieu-Daudé <f4...@amsat.org> This is a combination of 2 series posted by Bernhard Beschow:
"malta: Fix PCI IRQ levels to be preserved during migration" v4 https://lore.kernel.org/qemu-devel/20220217101924.15347-1-shen...@gmail.com/ "isa: Resolve unneeded IRQ attributes from ISADevice" v3 https://lore.kernel.org/qemu-devel/20220301220037.76555-1-shen...@gmail.com/ Bernhard, can you check if the 2nd series got rebased properly? Thanks, Phil. Bernhard Beschow (13): hw/mips/gt64xxx_pci: Fix PCI IRQ levels to be preserved during migration malta: Move PCI interrupt handling from gt64xxx_pci to piix4 hw/isa/piix4: Resolve redundant i8259[] attribute hw/isa/piix4: Pass PIIX4State as opaque parameter for piix4_set_irq() hw/isa/piix4: Resolve global instance variable hw/isa/piix4: Replace some magic IRQ constants hw/mips/gt64xxx_pci: Resolve gt64120_register() 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/isa: Drop unused attributes from ISADevice hw/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 | 56 +++++++++++++++++++++--- hw/mips/gt64xxx_pci.c | 80 +++-------------------------------- hw/mips/malta.c | 7 +-- hw/net/ne2000-isa.c | 2 +- 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/mips/mips.h | 3 -- include/hw/rtc/mc146818rtc.h | 1 + include/hw/southbridge/piix.h | 2 - tests/qemu-iotests/172.out | 26 ------------ 23 files changed, 114 insertions(+), 171 deletions(-) -- 2.34.1
