summary refs log tree commit diff stats
path: root/hw/r2d.c
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2011-08-11 16:07:20 -0700
committerAvi Kivity <avi@redhat.com>2011-10-02 16:14:02 +0200
commit27a9d2eacb7f5533c31d6f0f1560ee824407f037 (patch)
tree81bff508688eaaaad37a107ef0db23b1519abee5 /hw/r2d.c
parenta6dc4c2d95f7b7bd95a53e8c2e524a8a202b4d1f (diff)
downloadfocaccia-qemu-27a9d2eacb7f5533c31d6f0f1560ee824407f037.tar.gz
focaccia-qemu-27a9d2eacb7f5533c31d6f0f1560ee824407f037.zip
sm501: Pass address_space_mem to sm501_init
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/r2d.c')
-rw-r--r--hw/r2d.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/r2d.c b/hw/r2d.c
index b8b0df3bb6..82377a0a10 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -37,6 +37,7 @@
 #include "usb.h"
 #include "flash.h"
 #include "blockdev.h"
+#include "exec-memory.h"
 
 #define FLASH_BASE 0x00000000
 #define FLASH_SIZE 0x02000000
@@ -235,6 +236,7 @@ static void r2d_init(ram_addr_t ram_size,
     qemu_irq *irq;
     DriveInfo *dinfo;
     int i;
+    MemoryRegion *address_space_mem = get_system_memory();
 
     if (!cpu_model)
         cpu_model = "SH7751R";
@@ -258,7 +260,8 @@ static void r2d_init(ram_addr_t ram_size,
     sysbus_create_varargs("sh_pci", 0x1e200000, irq[PCI_INTA], irq[PCI_INTB],
                           irq[PCI_INTC], irq[PCI_INTD], NULL);
 
-    sm501_init(0x10000000, SM501_VRAM_SIZE, irq[SM501], serial_hds[2]);
+    sm501_init(address_space_mem, 0x10000000, SM501_VRAM_SIZE,
+               irq[SM501], serial_hds[2]);
 
     /* onboard CF (True IDE mode, Master only). */
     dinfo = drive_get(IF_IDE, 0, 0);