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/serial.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'hw/serial.c') diff --git a/hw/serial.c b/hw/serial.c index 0fafc1d..d35c7a9 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -28,7 +28,6 @@ #include "pc.h" #include "qemu-timer.h" #include "sysemu.h" -#include "exec-memory.h" //#define DEBUG_SERIAL @@ -855,9 +854,10 @@ static const MemoryRegionOps serial_mm_ops[3] = { }, }; -SerialState *serial_mm_init (target_phys_addr_t base, int it_shift, - qemu_irq irq, int baudbase, - CharDriverState *chr, enum device_endian end) +SerialState *serial_mm_init(MemoryRegion *address_space, + target_phys_addr_t base, int it_shift, + qemu_irq irq, int baudbase, + CharDriverState *chr, enum device_endian end) { SerialState *s; @@ -873,7 +873,7 @@ SerialState *serial_mm_init (target_phys_addr_t base, int it_shift, memory_region_init_io(&s->io, &serial_mm_ops[end], s, "serial", 8 << it_shift); - memory_region_add_subregion(get_system_memory(), base, &s->io); + memory_region_add_subregion(address_space, base, &s->io); serial_update_msl(s); return s; -- cgit v1.1