diff options
| author | Richard Henderson <rth@twiddle.net> | 2011-08-11 16:07:16 -0700 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-10-02 16:14:02 +0200 |
| commit | 39186d8ab8af8937cee4743cc1956bdc28923ac9 (patch) | |
| tree | 24c3d9953aa8900f96aae4086799a4795502de43 /hw/ppc440.c | |
| parent | 2ff0c7c3c2251e7e81e90c9556dda64261d033ec (diff) | |
serial: Add MemoryRegion parameter to serial_mm_init
Remove the get_system_memory() call from serial_mm_init, pushing
it back into the callers. In many cases we already have the
system memory region available.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/ppc440.c')
| -rw-r--r-- | hw/ppc440.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/hw/ppc440.c b/hw/ppc440.c index 0cd7bcad43..1d1376e29f 100644 --- a/hw/ppc440.c +++ b/hw/ppc440.c @@ -20,6 +20,7 @@ #include "ppc405.h" #include "sysemu.h" #include "kvm.h" +#include "exec-memory.h" #define PPC440EP_PCI_CONFIG 0xeec00000 #define PPC440EP_PCI_INTACK 0xeed00000 @@ -92,12 +93,14 @@ CPUState *ppc440ep_init(ram_addr_t *ram_size, PCIBus **pcip, isa_mmio_init(PPC440EP_PCI_IO, PPC440EP_PCI_IOLEN); if (serial_hds[0] != NULL) { - serial_mm_init(0xef600300, 0, pic[0], PPC_SERIAL_MM_BAUDBASE, - serial_hds[0], DEVICE_BIG_ENDIAN); + serial_mm_init(get_system_memory(), 0xef600300, 0, pic[0], + PPC_SERIAL_MM_BAUDBASE, serial_hds[0], + DEVICE_BIG_ENDIAN); } if (serial_hds[1] != NULL) { - serial_mm_init(0xef600400, 0, pic[1], PPC_SERIAL_MM_BAUDBASE, - serial_hds[1], DEVICE_BIG_ENDIAN); + serial_mm_init(get_system_memory(), 0xef600400, 0, pic[1], + PPC_SERIAL_MM_BAUDBASE, serial_hds[1], + DEVICE_BIG_ENDIAN); } return env; |