[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/24] leon3: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 12/24] leon3: convert to memory API |
Date: |
Wed, 24 Aug 2011 13:11:11 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/leon3.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/leon3.c b/hw/leon3.c
index efe6c7c..5c3780d 100644
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -21,6 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+
+#include <glib.h>
+
#include "hw.h"
#include "qemu-timer.h"
#include "qemu-char.h"
@@ -102,7 +105,8 @@ static void leon3_generic_hw_init(MemoryRegion
*address_space_mem,
const char *cpu_model)
{
CPUState *env;
- ram_addr_t ram_offset, prom_offset;
+ MemoryRegion *ram = g_new(MemoryRegion, 1);
+ MemoryRegion *prom = g_new(MemoryRegion, 1);
int ret;
char *filename;
qemu_irq *cpu_irqs = NULL;
@@ -141,14 +145,14 @@ static void leon3_generic_hw_init(MemoryRegion
*address_space_mem,
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 20/24] mainstone: convert to memory API, (continued)
[Qemu-devel] [PATCH 07/24] an5206: convert to memory API, Avi Kivity, 2011/08/24
[Qemu-devel] [PATCH 03/24] sysbus: add helpers to add and delete memory regions to the system bus, Avi Kivity, 2011/08/24
[Qemu-devel] [PATCH 13/24] cirrus: wrap memory update in a transaction, Avi Kivity, 2011/08/24
[Qemu-devel] [PATCH 12/24] leon3: convert to memory API,
Avi Kivity <=
[Qemu-devel] [PATCH 24/24] milkymist: convert to memory API, Avi Kivity, 2011/08/24
[Qemu-devel] [PATCH 15/24] Makefile.hw: allow hw/ files to include glib headers, Avi Kivity, 2011/08/24
[Qemu-devel] [PATCH 04/24] pci_host: convert conf index and data ports to memory API, Avi Kivity, 2011/08/24
[Qemu-devel] [PATCH 06/24] QEMUMachine: pass address space to machine init function, Avi Kivity, 2011/08/24
[Qemu-devel] [PATCH 16/24] pflash_cfi01/pflash_cfi02: convert to memory API, Avi Kivity, 2011/08/24