[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/17] shix: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 05/17] shix: convert to memory API |
Date: |
Sun, 30 Oct 2011 16:33:42 +0200 |
RAM wasn't actually allocated, only used, so fix that as well.
Signed-off-by: Avi Kivity <address@hidden>
---
hw/shix.c | 14 +++++++++++---
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)
--
1.7.6.3
- [Qemu-devel] [PATCH 00/17] Memory API conversions, batch 13, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 01/17] tosa: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 02/17] versatilepb: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 07/17] parallel: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 05/17] shix: convert to memory API,
Avi Kivity <=
- [Qemu-devel] [PATCH 08/17] zaurus: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 09/17] pl011: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 12/17] pl050: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 03/17] vexpress: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 04/17] virtex_ml507: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 06/17] jazz_led: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 11/17] pl031: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 10/17] pl022: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 16/17] pl181: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 17/17] pl190: convert to memory API, Avi Kivity, 2011/10/30