On 10/10/2011 09:59 AM, Avi Kivity wrote:
Please pull from:
git://github.com/avikivity memory/batch
This has been on the list for a bit, with no comments so far.
CC libhw64/vl.o
In file included from /home/anthony/git/qemu/hw/pc.h:5:0,
from /home/anthony/git/qemu/vl.c:120:
/home/anthony/git/qemu/memory.h:29:29: error: redefinition of typedef
‘MemoryRegion’
/home/anthony/git/qemu/ioport.h:55:29: note: previous declaration of
‘MemoryRegion’ was here
/home/anthony/git/qemu/memory.h:30:35: error: redefinition of typedef
‘MemoryRegionPortio’
/home/anthony/git/qemu/ioport.h:56:35: note: previous declaration of
‘MemoryRegionPortio’ was here
make[1]: *** [vl.o] Error 1
make: *** [subdir-libhw64] Error 2
And indeed, there are two definitions of MemoryRegion. This looks to be the
culprit:
commit b4d9c72e1148b4521083147c50d410b2098008e4
Author: Avi Kivity <a...@redhat.com>
Date: Mon Sep 26 14:52:26 2011 +0300
Introduce PortioList
Regards,
Anthony Liguori
Avi Kivity (7):
palm: convert to memory API
petalogix_ml605: convert to memory API
petalogix_s2adsp1800: convert to memory API
ppc405_boards: convert to memory API
ppc_newworld: convert to memory API
Introduce PortioList
isa: Add isa_register_portio_list()
Jan Kiszka (1):
memory: Fix old portio word accesses
Peter Maydell (3):
hw/lan9118.c: Convert to MemoryRegion
hw/arm11mpcore: Clean up to avoid using sysbus_mmio_init_cb2
hw/versatile_pci: Expose multiple sysbus mmio regions
Richard Henderson (13):
isa: Tidy support code for isabus_get_fw_dev_path
fdc: Convert to isa_register_portio_list
gus: Convert to isa_register_portio_list
m48t59: Convert to isa_register_ioport
rtc: Convert to isa_register_ioport
ne2000: Convert to isa_register_ioport
parallel: Convert to isa_register_portio_list
sb16: Convert to isa_register_portio_list
vga: Convert to isa_register_portio_list
pc: Convert port92 to isa_register_ioport
vmport: Convert to isa_register_ioport
ide: Convert to isa_register_portio_list
isa: Remove isa_init_ioport_range and isa_init_ioport
Makefile.objs | 2 +-
Makefile.target | 2 +-
hw/arm11mpcore.c | 13 +-----
hw/fdc.c | 34 ++-----------
hw/gus.c | 38 +++++++-------
hw/ide/core.c | 30 +++++++----
hw/ide/internal.h | 3 +-
hw/ide/isa.c | 4 +-
hw/ide/piix.c | 7 ++-
hw/ide/via.c | 7 ++-
hw/isa-bus.c | 45 +++++++----------
hw/isa.h | 38 ++++++++++++---
hw/lan9118.c | 29 ++++-------
hw/m48t59.c | 15 +++++-
hw/mc146818rtc.c | 15 +++++-
hw/ne2000-isa.c | 5 +--
hw/palm.c | 53 +++++++++-----------
hw/parallel.c | 47 +++++++++++-------
hw/pc.c | 16 +++++-
hw/petalogix_ml605_mmu.c | 15 +++---
hw/petalogix_s3adsp1800_mmu.c | 18 ++++---
hw/ppc405_boards.c | 85 ++++++++++++++------------------
hw/ppc_newworld.c | 39 ++++++--------
hw/qxl.c | 2 +-
hw/realview.c | 12 ++++-
hw/sb16.c | 32 +++++-------
hw/versatile_pci.c | 42 +++-------------
hw/versatilepb.c | 12 ++++-
hw/vga-isa.c | 17 ++----
hw/vga-pci.c | 2 +-
hw/vga.c | 73 ++++++++++++++++------------
hw/vga_int.h | 7 ++-
hw/vmport.c | 16 +++++-
hw/vmware_vga.c | 7 ++-
ioport.c | 108 +++++++++++++++++++++++++++++++++++++++++
ioport.h | 21 ++++++++
memory.c | 18 +++++--
37 files changed, 535 insertions(+), 394 deletions(-)
