aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-10-06 12:52:27 +0200
committerAvi Kivity <avi@redhat.com>2011-11-24 18:31:54 +0200
commit0af58e58a106eda29d21a6a32ae0f81909444fe4 (patch)
tree222d25be004fa9d42baa4b366a4fd2571be77234
parent333b13fc3c6b6172d0645aa4986257824e5c5745 (diff)
downloadqemu-0af58e58a106eda29d21a6a32ae0f81909444fe4.zip
qemu-0af58e58a106eda29d21a6a32ae0f81909444fe4.tar.gz
qemu-0af58e58a106eda29d21a6a32ae0f81909444fe4.tar.bz2
shix: convert to memory API
RAM wasn't actually allocated, only used, so fix that as well. Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--hw/shix.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/hw/shix.c b/hw/shix.c
index dbf4764..670ddb5 100644
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -32,6 +32,7 @@
#include "sysemu.h"
#include "boards.h"
#include "loader.h"
+#include "exec-memory.h"
#define BIOS_FILENAME "shix_bios.bin"
#define BIOS_ADDRESS 0xA0000000
@@ -44,6 +45,9 @@ static void shix_init(ram_addr_t ram_size,
int ret;
CPUState *env;
struct SH7750State *s;
+ MemoryRegion *sysmem = get_system_memory();
+ MemoryRegion *rom = g_new(MemoryRegion, 1);
+ MemoryRegion *sdram = g_new(MemoryRegion, 2);
if (!cpu_model)
cpu_model = "any";
@@ -53,11 +57,15 @@ static void shix_init(ram_addr_t ram_size,
/* Allocate memory space */
printf("Allocating ROM\n");
- cpu_register_physical_memory(0x00000000, 0x00004000, IO_MEM_ROM);
+ memory_region_init_ram(rom, NULL, "shix.rom", 0x4000);
+ memory_region_set_readonly(rom, true);
+ memory_region_add_subregion(sysmem, 0x00000000, rom);
printf("Allocating SDRAM 1\n");
- cpu_register_physical_memory(0x08000000, 0x01000000, 0x00004000);
+ memory_region_init_ram(&sdram[0], NULL, "shix.sdram1", 0x01000000);
+ memory_region_add_subregion(sysmem, 0x08000000, &sdram[0]);
printf("Allocating SDRAM 2\n");
- cpu_register_physical_memory(0x0c000000, 0x01000000, 0x01004000);
+ memory_region_init_ram(&sdram[1], NULL, "shix.sdram2", 0x01000000);
+ memory_region_add_subregion(sysmem, 0x0c000000, &sdram[1]);
/* Load BIOS in 0 (and access it through P2, 0xA0000000) */
if (bios_name == NULL)