[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 18/22] mainstone: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v2 18/22] mainstone: convert to memory API |
Date: |
Wed, 24 Aug 2011 16:40:55 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/mainstone.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 78af41b..82e9571 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -17,6 +17,7 @@
#include "flash.h"
#include "blockdev.h"
#include "sysbus.h"
+#include "exec-memory.h"
/* Device addresses */
#define MST_FPGA_PHYS 0x08000000
@@ -90,7 +91,8 @@ static struct arm_boot_info mainstone_binfo = {
.ram_size = 0x04000000,
};
-static void mainstone_common_init(ram_addr_t ram_size,
+static void mainstone_common_init(MemoryRegion *address_space_mem,
+ ram_addr_t ram_size,
const char *kernel_filename,
const char *kernel_cmdline, const char *initrd_filename,
const char *cpu_model, enum mainstone_model_e model, int
arm_id)
@@ -101,6 +103,7 @@ static void mainstone_common_init(ram_addr_t ram_size,
DeviceState *mst_irq;
DriveInfo *dinfo;
int i;
+ MemoryRegion *rom = g_new(MemoryRegion, 1);
MemoryRegion *flashes = g_new(MemoryRegion, 2);
const MemoryRegionOps *flash_ops;
@@ -109,9 +112,9 @@ static void mainstone_common_init(ram_addr_t ram_size,
/* Setup CPU & memory */
cpu = pxa270_init(mainstone_binfo.ram_size, cpu_model);
- cpu_register_physical_memory(0, MAINSTONE_ROM,
- qemu_ram_alloc(NULL, "mainstone.rom",
- MAINSTONE_ROM) | IO_MEM_ROM);
+ memory_region_init_ram(rom, NULL, "mainstone.rom", MAINSTONE_ROM);
+ memory_region_set_readonly(rom, true);
+ memory_region_add_subregion(address_space_mem, 0, rom);
#ifdef TARGET_WORDS_BIGENDIAN
flash_ops = &pflash_cfi01_ops_be;
@@ -172,7 +175,7 @@ static void mainstone_init(ram_addr_t ram_size,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
- mainstone_common_init(ram_size, kernel_filename,
+ mainstone_common_init(get_system_memory(), ram_size, kernel_filename,
kernel_cmdline, initrd_filename, cpu_model, mainstone, 0x196);
}
--
1.7.5.3
- [Qemu-devel] [PATCH v2 11/22] cirrus: wrap memory update in a transaction, (continued)
- [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
- [Qemu-devel] [PATCH v2 17/22] lm32_boards: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 13/22] Makefile.hw: allow hw/ files to include glib headers, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 05/22] an5206: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 04/22] ReadWriteHandler: remove, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 12/22] piix_pci: wrap memory update in a transaction, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 14/22] pflash_cfi01/pflash_cfi02: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 18/22] mainstone: convert to memory API,
Avi Kivity <=
- [Qemu-devel] [PATCH v2 15/22] dummy_m68k: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH v2 21/22] milkymist-softusb: convert to memory API, Avi Kivity, 2011/08/24
- Re: [Qemu-devel] [PATCH v2 00/22] Memory API conversions, batch 5, Richard Henderson, 2011/08/24