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/pxa2xx.c | |
| parent | 2ff0c7c3c2251e7e81e90c9556dda64261d033ec (diff) | |
| download | qemu-39186d8ab8af8937cee4743cc1956bdc28923ac9.zip qemu-39186d8ab8af8937cee4743cc1956bdc28923ac9.tar.gz qemu-39186d8ab8af8937cee4743cc1956bdc28923ac9.tar.bz2 | |
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/pxa2xx.c')
| -rw-r--r-- | hw/pxa2xx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c index 60f4c34..c47e698 100644 --- a/hw/pxa2xx.c +++ b/hw/pxa2xx.c @@ -15,6 +15,7 @@ #include "ssi.h" #include "qemu-char.h" #include "blockdev.h" +#include "exec-memory.h" static struct { target_phys_addr_t io_base; @@ -2115,7 +2116,7 @@ PXA2xxState *pxa270_init(unsigned int sdram_size, const char *revision) for (i = 0; pxa270_serial[i].io_base; i++) { if (serial_hds[i]) { - serial_mm_init(pxa270_serial[i].io_base, 2, + serial_mm_init(get_system_memory(), pxa270_serial[i].io_base, 2, qdev_get_gpio_in(s->pic, pxa270_serial[i].irqn), 14857000 / 16, serial_hds[i], DEVICE_NATIVE_ENDIAN); @@ -2247,7 +2248,7 @@ PXA2xxState *pxa255_init(unsigned int sdram_size) for (i = 0; pxa255_serial[i].io_base; i++) { if (serial_hds[i]) { - serial_mm_init(pxa255_serial[i].io_base, 2, + serial_mm_init(get_system_memory(), pxa255_serial[i].io_base, 2, qdev_get_gpio_in(s->pic, pxa255_serial[i].irqn), 14745600 / 16, serial_hds[i], DEVICE_NATIVE_ENDIAN); |