Please pull from git://github.com/avikivity/qemu.git memory/batch
This is the delayed ISA conversion series, now hopefully working across the board. Avi Kivity (4): mips_malta: move i8259 initialization after piix4 initialization mips_jazz: initialize i8259 after the ISA bus mips_r4k: initialize i8259 after the ISA bus ppc_prep: initialize i8259 after the ISA bus Richard Henderson (10): pci: add pci_address_space_io() isa: Pass i/o address space to isa_bus_new isa: add isa_register_ioport() pc: Re-order pc_init1 to initialize the ISA bus before ISA devices cs4231a: Convert to MemoryRegion i8254: Convert to MemoryRegion i8259: Convert to MemoryRegion pckbd: Convert to MemoryRegion serial: Convert serial_isa_initfn to MemoryRegion fdc: Convert isabus_fdc_init1 to MemoryRegion hw/cs4231a.c | 38 ++++++++++++++++---------------- hw/fdc.c | 53 ++++++++++++++++++++++++++++----------------- hw/i8254.c | 16 +++++++++++-- hw/i8259.c | 65 ++++++++++++++++++++++++++++++++++++++---------------- hw/isa-bus.c | 14 +++++++++++- hw/isa.h | 7 ++++- hw/mips_jazz.c | 21 +++++++++++------ hw/mips_malta.c | 20 ++++++++++++---- hw/mips_r4k.c | 2 +- hw/pc.h | 2 +- hw/pc_piix.c | 24 +++++++++++--------- hw/pci.c | 5 ++++ hw/pci.h | 1 + hw/pckbd.c | 59 ++++++++++++++++++++++++++++++------------------- hw/piix4.c | 2 +- hw/piix_pci.c | 2 +- hw/ppc_prep.c | 4 +- hw/serial.c | 15 ++++++++++-- hw/sun4u.c | 2 +- hw/vt82c686.c | 2 +- 20 files changed, 232 insertions(+), 122 deletions(-) -- 1.7.6.3