From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwAQs-0005LP-Ux for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwAQm-0006GV-Vk for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61794) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwAQl-0006F9-Lr for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:32 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7OABUQ8011353 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 24 Aug 2011 06:11:30 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7OABTDu015211 for ; Wed, 24 Aug 2011 06:11:30 -0400 From: Avi Kivity Date: Wed, 24 Aug 2011 13:11:19 +0300 Message-Id: <1314180683-8227-21-git-send-email-avi@redhat.com> In-Reply-To: <1314180683-8227-1-git-send-email-avi@redhat.com> References: <1314180683-8227-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 20/24] mainstone: convert to memory API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Avi Kivity --- hw/mainstone.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/mainstone.c b/hw/mainstone.c index cb62abb..ae7a542 100644 --- a/hw/mainstone.c +++ b/hw/mainstone.c @@ -91,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) @@ -102,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; @@ -110,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; @@ -175,7 +177,7 @@ static void mainstone_init(MemoryRegion *address_space_mem, 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(address_space_mem, ram_size, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, mainstone, 0x196); } -- 1.7.5.3