[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 17/22] lm32_boards: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v2 17/22] lm32_boards: convert to memory API |
Date: |
Wed, 24 Aug 2011 16:40:54 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/lm32_boards.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index f032bc0..a84007b 100644
--- a/hw/lm32_boards.c
+++ b/hw/lm32_boards.c
@@ -28,6 +28,7 @@
#include "elf.h"
#include "lm32_hwsetup.h"
#include "lm32.h"
+#include "exec-memory.h"
typedef struct {
CPUState *env;
@@ -76,7 +77,8 @@ static void lm32_evr_init(ram_addr_t ram_size_not_used,
{
CPUState *env;
DriveInfo *dinfo;
- ram_addr_t phys_ram;
+ MemoryRegion *address_space_mem = get_system_memory();
+ MemoryRegion *phys_ram = g_new(MemoryRegion, 1);
MemoryRegion *phys_flash = g_new(MemoryRegion, 1);
qemu_irq *cpu_irq, irq[32];
ResetInfo *reset_info;
@@ -105,8 +107,8 @@ static void lm32_evr_init(ram_addr_t ram_size_not_used,
reset_info->flash_base = flash_base;
- phys_ram = qemu_ram_alloc(NULL, "lm32_evr.sdram", ram_size);
- cpu_register_physical_memory(ram_base, ram_size, phys_ram | IO_MEM_RAM);
+ memory_region_init_ram(phys_ram, NULL, "lm32_evr.sdram", ram_size);
+ memory_region_add_subregion(address_space_mem, ram_base, phys_ram);
memory_region_init_rom_device(phys_flash, &pflash_cfi02_ops_be,
NULL, "lm32_evr.flash", flash_size);
@@ -165,7 +167,8 @@ static void lm32_uclinux_init(ram_addr_t ram_size_not_used,
{
CPUState *env;
DriveInfo *dinfo;
- ram_addr_t phys_ram;
+ MemoryRegion *address_space_mem = get_system_memory();
+ MemoryRegion *phys_ram = g_new(MemoryRegion, 1);
MemoryRegion *phys_flash = g_new(MemoryRegion, 1);
qemu_irq *cpu_irq, irq[32];
HWSetup *hw;
@@ -201,8 +204,8 @@ static void lm32_uclinux_init(ram_addr_t ram_size_not_used,
reset_info->flash_base = flash_base;
- phys_ram = qemu_ram_alloc(NULL, "lm32_uclinux.sdram", ram_size);
- cpu_register_physical_memory(ram_base, ram_size, phys_ram | IO_MEM_RAM);
+ memory_region_init_ram(phys_ram, NULL, "lm32_uclinux.sdram", ram_size);
+ memory_region_add_subregion(address_space_mem, ram_base, phys_ram);
memory_region_init_rom_device(phys_flash, &pflash_cfi01_ops_be,
NULL, "lm32_uclinux.flash", flash_size);
--
1.7.5.3
- [Qemu-devel] [PATCH v2 22/22] milkymist: convert to memory API, (continued)
- [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
- [Qemu-devel] [PATCH v2 17/22] lm32_boards: convert to memory API,
Avi Kivity <=
- [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, 2011/08/24
- [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