[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/22] leon3: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v2 10/22] leon3: convert to memory API |
Date: |
Wed, 24 Aug 2011 16:40:47 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/leon3.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/hw/leon3.c b/hw/leon3.c
index a62a941..607ec85 100644
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -29,6 +29,7 @@
#include "loader.h"
#include "elf.h"
#include "trace.h"
+#include "exec-memory.h"
#include "grlib.h"
@@ -100,7 +101,9 @@ static void leon3_generic_hw_init(ram_addr_t ram_size,
const char *cpu_model)
{
CPUState *env;
- ram_addr_t ram_offset, prom_offset;
+ MemoryRegion *address_space_mem = get_system_memory();
+ MemoryRegion *ram = g_new(MemoryRegion, 1);
+ MemoryRegion *prom = g_new(MemoryRegion, 1);
int ret;
char *filename;
qemu_irq *cpu_irqs = NULL;
@@ -139,14 +142,14 @@ static void leon3_generic_hw_init(ram_addr_t ram_size,
exit(1);
}
- ram_offset = qemu_ram_alloc(NULL, "leon3.ram", ram_size);
- cpu_register_physical_memory(0x40000000, ram_size, ram_offset |
IO_MEM_RAM);
+ memory_region_init_ram(ram, NULL, "leon3.ram", ram_size);
+ memory_region_add_subregion(address_space_mem, 0x40000000, ram);
/* Allocate BIOS */
prom_size = 8 * 1024 * 1024; /* 8Mb */
- prom_offset = qemu_ram_alloc(NULL, "Leon3.bios", prom_size);
- cpu_register_physical_memory(0x00000000, prom_size,
- prom_offset | IO_MEM_ROM);
+ memory_region_init_ram(prom, NULL, "Leon3.bios", prom_size);
+ memory_region_set_readonly(prom, true);
+ memory_region_add_subregion(address_space_mem, 0x00000000, prom);
/* Load boot prom */
if (bios_name == NULL) {
--
1.7.5.3
- [Qemu-devel] [PATCH v2 00/22] Memory API conversions, batch 5, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 01/22] stellaris_enet: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 02/22] sysbus: add helpers to add and delete memory regions to the system bus, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 08/22] sysbus: add sysbus_add_memory_overlap(), Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 10/22] leon3: convert to memory API,
Avi Kivity <=
- [Qemu-devel] [PATCH v2 22/22] milkymist: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 20/22] milkymist-minimac2: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 09/22] integratorcp: convert to memory API (RAM/flash only), Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 03/22] pci_host: convert conf index and data ports to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 06/22] armv7m: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 07/22] axis_dev88: convert to memory API (RAM only), Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 19/22] mcf5208: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 11/22] cirrus: wrap memory update in a transaction, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 16/22] g364fb: convert to memory API, Avi Kivity, 2011/08/24