On 11/29/2011 05:47 AM, Avi Kivity wrote:
Please pull from
git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/batch
to receive the final batch of mmio conversions to the memory API (note
that ioports still use the old API). While there may be a few
regressions in there, it will be a lot easier to find them in the tree,
and the series is easily bisectable.
I tested it on and x86_64 host with the images from the wiki, and saw no
obvious issues.
This conversion was brought to you by: Avi Kivity, Benoît Canet, Blue
Swirl, Edgar E. Iglesias, Fabien Chouteau, Hervé Poussineau, Jan Kiszka,
Michael Walle, Peter Maydell, and Richard Henderson. Thanks to everyone
who contributed.
Pulled. Thanks.
Regards,
Anthony Liguori
Avi Kivity (66):
tosa: convert to memory API
versatilepb: convert to memory API
vexpress: convert to memory API
virtex_ml507: convert to memory API
shix: convert to memory API
jazz_led: convert to memory API
parallel: convert to memory API
zaurus: convert to memory API
pl011: convert to memory API
pl022: convert to memory API
pl031: convert to memory API
pl050: convert to memory API
pl061: convert to memory API
pl080: convert to memory API
pl110: convert to memory API
pl181: convert to memory API
pl190: convert to memory API
fdc: convert to memory API
sbi: convert to memory API
rc4030: convert to memory API
hpet: convert to memory API
ide/mmio: convert to memory API
cs4321: convert to memory API
dp8393x: convert to memory API
ds1225y: convert to memory API
m48t59: convert to memory API
memory: add MemoryRegionOps::valid.accepts
esp: convert to memory API
fw_cfg: convert to memory API
mpc8544_guts: convert to memory API
empty_slot: convert to memory API
eccmemctl: convert to memory API
axis_dev88: convert to memory API
pxa2xx_dma: convert to memory API
sparc32_dma: convert to memory API
bitbang_i2c: avoid call to sysbus_init_mmio()
musicpal: avoid call to sysbus_init_mmio()
grlib_apbuart: convert to memory API
grlib_gptimer: convert to memory API
grlib_irqmp: convert to memory API
sun4m_iommu: convert to memory API
sun4c_intctl: convert to memory API
xilinx_axidma: convert to memory API
xilinx_axienet: convert to memory API
lm32_timer: convert to memory API
ppc4xx_pci: convert to memory API
ppce500_pci: convert to memory API
prep_pci: convert to memory API
omap_uart: convert to memory API
omap: remove L4_MUX_HACK
omap: eliminate l4_register_io_memory
omap_l4: add memory API variant of omap_l4_attach()
omap_mmc: convert to memory API
omap_tap: convert to memory API
omap_synctimer: convert to memory API
omap_gp_timer: convert to memory API
omap_sdrc: convert to memory API
omap_dma: convert to memory API
omap_gpio: convert to memory API
sysbus: remove sysbus_init_mmio()
sysbus: rename sysbus_init_mmio_region() to sysbus_init_mmio()
omap2: convert to memory API (part I)
omap2: convert to memory API (part II)
omap_dss: convert to memory API
omap_l4: remove omap_l4_attach()
omap_l4: rename omap_l4_attach_region() to omap_l4_attach()
Benoît Canet (58):
integratorcp: convert core to memory API
integratorcp: convert icp pic to memory API
integratorcp: convert control to memory API
stellaris: convert sys to memory API
stellaris: convert i2c to memory API
stellaris: convert adc to memory API
stellaris: convert gptm to memory API
marvell_88x8618_audio: convert to memory API
mst_fpga: convert to memory API
syborg_fb: convert to memory API
syborg_interrupt: convert to memory API
syborg_keyboard: convert to memory API
syborg_pointer: convert to memory API
syborg_rtc: convert to memory API
syborg_serial: convert to memory API
syborg_timer: convert to memory API
syborg_virtio: convert to memory API
pxa2xx_gpio: convert to memory API
pxa2xx_pcmcia.c: convert common memory space to memory API
pxa2xx_pcmcia.c: convert attribute memory space to memory API
pxa2xx_pcmcia.c: convert io memory space to memory API
pxa2xx_keypad: convert to memory API
pxa2xx_timer: convert to memory API
pxa2xx_pic: convert to memory API
pxa2xx_mmci: convert to memory API
pxa2xx_lcd: convert to memory API
slavio_misc: convert apc to memory API
slavio_misc: convert configuration to memory API
slavio_misc: convert diagnostic to memory API
slavio_misc: convert modem to memory API
slavio_misc: convert leds to memory API
slavio_misc: convert system control to memory API
slavio_misc: convert aux1 to memory API
slavio_misc: convert aux2 to memory API
slavio_intctl: convert master interrupt controller to memory API
slavio_intctl: convert slaves interrupt controllers to memory API
slavio_timer: convert to memory API
sh7750: convert memory controller/ioport to memory API
sh7750: convert cache and tlb to memory API
sh_timer: convert to memory API
sh_intc: convert interrupt controller to memory API
sh_serial: convert to memory API
mcf5206: convert to memory API
mcf_uart: convert to memory API
mcf_fec: convert to memory API
mcf_intc: convert to memory API
lm32_uart: convert to memory API
lm32_sys: convert to memory API
bonito: convert north bridge register mapping to memory API
bonito: convert north bridge pci config to memory API
bonito: convert south bridge pci config to memory API
bonito: convert ldma to memory API
bonito: convert cop to memory API
omap_l4: convert to memory API
omap_sx1: convert to memory API
omap_spi: convert to memory API
omap_lcdc: convert to memory API
omap_i2c: convert to memory API
Jan Kiszka (2):
ioapic: Reject non-dword accesses to IOWIN register
ioapic: Convert to memory API
hw/an5206.c | 2 +-
hw/apb_pci.c | 6 +-
hw/apic.c | 2 +-
hw/arm11mpcore.c | 2 +-
hw/arm_sysctl.c | 2 +-
hw/arm_timer.c | 4 +-
hw/armv7m.c | 2 +-
hw/axis_dev88.c | 63 ++++++------
hw/bitbang_i2c.c | 4 +-
hw/bonito.c | 201 ++++++++++++++++--------------------
hw/cs4231.c | 27 ++---
hw/dec_pci.c | 4 +-
hw/dp8393x.c | 30 +++---
hw/ds1225y.c | 62 +++---------
hw/eccmemctl.c | 63 ++++++------
hw/empty_slot.c | 32 +++----
hw/escc.c | 2 +-
hw/esp.c | 37 ++++---
hw/etraxfs_eth.c | 2 +-
hw/etraxfs_pic.c | 2 +-
hw/etraxfs_ser.c | 2 +-
hw/etraxfs_timer.c | 2 +-
hw/fdc.c | 58 ++++------
hw/fw_cfg.c | 110 ++++++++++++--------
hw/g364fb.c | 4 +-
hw/grackle_pci.c | 4 +-
hw/grlib_apbuart.c | 30 +++---
hw/grlib_gptimer.c | 34 +++---
hw/grlib_irqmp.c | 34 +++---
hw/hpet.c | 62 +++--------
hw/ide.h | 2 +
hw/ide/mmio.c | 57 ++++------
hw/integratorcp.c | 87 +++++++---------
hw/ioapic.c | 34 +++---
hw/jazz_led.c | 25 ++---
hw/lan9118.c | 2 +-
hw/lance.c | 2 +-
hw/lm32_sys.c | 28 +++---
hw/lm32_timer.c | 30 +++---
hw/lm32_uart.c | 31 +++---
hw/m48t59.c | 23 ++---
hw/marvell_88w8618_audio.c | 28 ++---
hw/mcf.h | 23 +++--
hw/mcf5206.c | 62 ++++++-----
hw/mcf5208.c | 11 +-
hw/mcf_fec.c | 38 ++++----
hw/mcf_intc.c | 33 +++---
hw/mcf_uart.c | 34 +++----
hw/milkymist-ac97.c | 2 +-
hw/milkymist-hpdmc.c | 2 +-
hw/milkymist-memcard.c | 2 +-
hw/milkymist-minimac2.c | 2 +-
hw/milkymist-pfpu.c | 2 +-
hw/milkymist-softusb.c | 2 +-
hw/milkymist-sysctl.c | 2 +-
hw/milkymist-tmu2.c | 2 +-
hw/milkymist-uart.c | 2 +-
hw/milkymist-vgafb.c | 2 +-
hw/mips.h | 8 +-
hw/mips_jazz.c | 10 +-
hw/mipsnet.c | 2 +-
hw/mpc8544_guts.c | 35 +++---
hw/mpcore.c | 2 +-
hw/mst_fpga.c | 29 ++---
hw/musicpal.c | 18 ++--
hw/nseries.c | 4 +-
hw/omap.h | 45 ++++++---
hw/omap1.c | 8 +-
hw/omap2.c | 207 +++++++++++++++++++-----------------
hw/omap_dma.c | 71 +++++++------
hw/omap_dss.c | 169 ++++++++++++++++-------------
hw/omap_gpio.c | 95 +++++++++--------
hw/omap_gptimer.c | 32 +++---
hw/omap_i2c.c | 45 +++++----
hw/omap_intc.c | 4 +-
hw/omap_l4.c | 182 ++++++--------------------------
hw/omap_lcdc.c | 33 +++---
hw/omap_mmc.c | 44 ++++----
hw/omap_sdrc.c | 39 ++++---
hw/omap_spi.c | 37 ++++---
hw/omap_sx1.c | 99 ++++++++----------
hw/omap_synctimer.c | 30 +++--
hw/omap_tap.c | 32 +++---
hw/omap_uart.c | 41 ++++----
hw/onenand.c | 2 +-
hw/opencores_eth.c | 4 +-
hw/parallel.c | 27 ++---
hw/pc.h | 3 +-
hw/pci_host.h | 1 +
hw/pl011.c | 27 ++---
hw/pl022.c | 29 ++---
hw/pl031.c | 30 ++----
hw/pl041.c | 2 +-
hw/pl050.c | 27 ++---
hw/pl061.c | 27 ++---
hw/pl080.c | 27 ++---
hw/pl110.c | 27 ++---
hw/pl181.c | 26 ++---
hw/pl190.c | 28 ++---
hw/ppc4xx_pci.c | 68 +++++--------
hw/ppce500_pci.c | 34 +++----
hw/ppce500_spin.c | 2 +-
hw/prep_pci.c | 23 ++---
hw/pxa.h | 15 ++-
hw/pxa2xx.c | 24 ++--
hw/pxa2xx_dma.c | 54 ++++------
hw/pxa2xx_gpio.c | 29 ++---
hw/pxa2xx_keypad.c | 34 +++----
hw/pxa2xx_lcd.c | 32 +++---
hw/pxa2xx_mmci.c | 31 +++---
hw/pxa2xx_pcmcia.c | 95 ++++++++---------
hw/pxa2xx_pic.c | 31 +++---
hw/pxa2xx_timer.c | 27 ++---
hw/r2d.c | 4 +-
hw/rc4030.c | 51 ++++-----
hw/realview.c | 2 +-
hw/realview_gic.c | 2 +-
hw/sbi.c | 33 +++---
hw/sh.h | 9 +-
hw/sh7750.c | 155 ++++++++++++++++------------
hw/sh_intc.c | 85 ++++++++++-----
hw/sh_intc.h | 7 +-
hw/sh_pci.c | 4 +-
hw/sh_serial.c | 55 ++++++-----
hw/sh_timer.c | 43 ++++----
hw/shix.c | 16 ++-
hw/slavio_intctl.c | 67 ++++++------
hw/slavio_misc.c | 250
+++++++++++++++++++++-----------------------
hw/slavio_timer.c | 41 ++++----
hw/smc91c111.c | 2 +-
hw/sparc32_dma.c | 31 +++---
hw/spitz.c | 2 +-
hw/stellaris.c | 115 ++++++++------------
hw/stellaris_enet.c | 2 +-
hw/strongarm.c | 12 +-
hw/sun4c_intctl.c | 36 +++----
hw/sun4m.c | 8 +-
hw/sun4m_iommu.c | 33 +++---
hw/sun4u.c | 4 +-
hw/syborg_fb.c | 28 ++---
hw/syborg_interrupt.c | 29 ++---
hw/syborg_keyboard.c | 28 ++---
hw/syborg_pointer.c | 28 ++---
hw/syborg_rtc.c | 28 ++---
hw/syborg_serial.c | 28 ++---
hw/syborg_timer.c | 27 ++---
hw/syborg_virtio.c | 26 ++---
hw/sysbus.c | 29 ++----
hw/sysbus.h | 6 +-
hw/tcx.c | 14 ++--
hw/tosa.c | 6 +-
hw/tusb6010.c | 4 +-
hw/unin_pci.c | 16 ++--
hw/usb-ohci.c | 2 +-
hw/versatile_pci.c | 6 +-
hw/versatilepb.c | 35 +++----
hw/vexpress.c | 31 +++---
hw/virtex_ml507.c | 6 +-
hw/xilinx_axidma.c | 29 ++---
hw/xilinx_axienet.c | 29 ++---
hw/xilinx_ethlite.c | 2 +-
hw/xilinx_intc.c | 2 +-
hw/xilinx_timer.c | 2 +-
hw/xilinx_uartlite.c | 2 +-
hw/zaurus.c | 26 ++---
memory.c | 12 ++-
memory.h | 7 ++
target-sh4/helper.c | 3 +
168 files changed, 2396 insertions(+), 2730 deletions(-)
