From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:57509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6I2C-0001Aa-0Z for qemu-devel@nongnu.org; Wed, 21 Sep 2011 04:20:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6I1z-0003vd-Gx for qemu-devel@nongnu.org; Wed, 21 Sep 2011 04:19:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6I1z-0003uf-43 for qemu-devel@nongnu.org; Wed, 21 Sep 2011 04:19:47 -0400 From: Avi Kivity Date: Wed, 21 Sep 2011 11:19:14 +0300 Message-Id: <1316593164-25199-4-git-send-email-avi@redhat.com> In-Reply-To: <1316593164-25199-1-git-send-email-avi@redhat.com> References: <1316593164-25199-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 03/13] mips_mipssim: convert to memory API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , qemu-devel@nongnu.org Signed-off-by: Avi Kivity --- hw/mips_mipssim.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c index ac65555..7407158 100644 --- a/hw/mips_mipssim.c +++ b/hw/mips_mipssim.c @@ -137,8 +137,9 @@ static void mipsnet_init(int base, qemu_irq irq, NICInfo *nd) const char *initrd_filename, const char *cpu_model) { char *filename; - ram_addr_t ram_offset; - ram_addr_t bios_offset; + MemoryRegion *address_space_mem = get_system_memory(); + MemoryRegion *ram = g_new(MemoryRegion, 1); + MemoryRegion *bios = g_new(MemoryRegion, 1); CPUState *env; ResetData *reset_info; int bios_size; @@ -162,14 +163,14 @@ static void mipsnet_init(int base, qemu_irq irq, NICInfo *nd) qemu_register_reset(main_cpu_reset, reset_info); /* Allocate RAM. */ - ram_offset = qemu_ram_alloc(NULL, "mips_mipssim.ram", ram_size); - bios_offset = qemu_ram_alloc(NULL, "mips_mipssim.bios", BIOS_SIZE); + memory_region_init_ram(ram, NULL, "mips_mipssim.ram", ram_size); + memory_region_init_ram(bios, NULL, "mips_mipssim.bios", BIOS_SIZE); + memory_region_set_readonly(bios, true); - cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM); + memory_region_add_subregion(address_space_mem, 0, ram); /* Map the BIOS / boot exception handler. */ - cpu_register_physical_memory(0x1fc00000LL, - BIOS_SIZE, bios_offset | IO_MEM_ROM); + memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); /* Load a BIOS / boot exception handler image. */ if (bios_name == NULL) bios_name = BIOS_FILENAME; -- 1.7.6.3