Current patches are a rework of my patches already available at [1]. They don't provide full support for multiple ISA buses (yet), but add a ISABus or ISADevice argument to all ISA functions. They are mostly mechanically touching every instanciation of ISA devices, so number of lines is quite high even if impact is quite low.
Some patches don't pass checkpass check due to spaces around parentheses, but malc asked to do so on files he maintains. Some more patches need to be provided to support multiple ISA buses, but they will mostly touch ISA bridges and hw/isa-bus.c file. Thanks [1] http://lists.gnu.org/archive/html/qemu-devel/2011-10/msg00094.html Changes v2->v3 rebased fixed compilation with some compilers (typedef redefinition) Changes v1->v2 rebased Hervé Poussineau (11): isa: give ISABus/ISADevice to isa_create(), isa_bus_irqs() and isa_get_irq() functions isa: move ISABus structure definition to header file i8259: give ISA device to isa_register_ioport() pc: give ISA bus to ISA methods alpha: give ISA bus to ISA methods sun4u: give ISA bus to ISA methods fulong2e: give ISA bus to ISA methods malta: give ISA bus to ISA methods isa: always use provided ISA bus when creating an isa device isa: always use provided ISA bus in isa_bus_irqs() audio: remove unused parameter isa_pic arch_init.c | 10 +++++----- arch_init.h | 2 +- hw/adlib.c | 2 +- hw/alpha_dp264.c | 12 +++++++----- hw/alpha_sys.h | 3 ++- hw/alpha_typhoon.c | 9 +++++---- hw/audiodev.h | 8 ++++---- hw/cs4231a.c | 4 ++-- hw/fdc.h | 4 ++-- hw/gus.c | 4 ++-- hw/i8254.c | 2 +- hw/i8259.c | 10 +++++----- hw/ide.h | 2 +- hw/ide/isa.c | 4 ++-- hw/ide/piix.c | 2 +- hw/ide/via.c | 2 +- hw/isa-bus.c | 33 ++++++++++++++++----------------- hw/isa.h | 17 +++++++++++------ hw/m48t59.c | 5 +++-- hw/mc146818rtc.c | 4 ++-- hw/mc146818rtc.h | 2 +- hw/mips_fulong2e.c | 20 ++++++++++---------- hw/mips_jazz.c | 13 +++++++------ hw/mips_malta.c | 27 ++++++++++++++------------- hw/mips_r4k.c | 21 +++++++++++---------- hw/nvram.h | 3 ++- hw/pc.c | 28 ++++++++++++++-------------- hw/pc.h | 39 ++++++++++++++++++++------------------- hw/pc_piix.c | 20 +++++++++++--------- hw/pcspk.c | 2 +- hw/piix4.c | 3 ++- hw/piix_pci.c | 8 +++++--- hw/ppc_prep.c | 20 +++++++++++--------- hw/sb16.c | 4 ++-- hw/sun4u.c | 24 +++++++++++++++--------- hw/vt82c686.c | 4 ++-- hw/vt82c686.h | 2 +- qemu-common.h | 1 + 38 files changed, 204 insertions(+), 176 deletions(-) -- 1.7.7.3
