From 39186d8ab8af8937cee4743cc1956bdc28923ac9 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Thu, 11 Aug 2011 16:07:16 -0700 Subject: 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 Signed-off-by: Avi Kivity --- hw/ppc440.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'hw/ppc440.c') diff --git a/hw/ppc440.c b/hw/ppc440.c index 0cd7bcad4..1d1376e29 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; -- cgit v1.2.3