From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwDhe-0005p1-P9 for qemu-devel@nongnu.org; Wed, 24 Aug 2011 09:41:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwDhZ-0007LJ-4U for qemu-devel@nongnu.org; Wed, 24 Aug 2011 09:41:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwDhY-0007K9-Nj for qemu-devel@nongnu.org; Wed, 24 Aug 2011 09:41:04 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7ODf4W9019788 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 24 Aug 2011 09:41:04 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7ODf2Bt002982 for ; Wed, 24 Aug 2011 09:41:03 -0400 From: Avi Kivity Date: Wed, 24 Aug 2011 16:40:52 +0300 Message-Id: <1314193259-27092-16-git-send-email-avi@redhat.com> In-Reply-To: <1314193259-27092-1-git-send-email-avi@redhat.com> References: <1314193259-27092-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH v2 15/22] dummy_m68k: 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/dummy_m68k.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c index eed9e38..30146b9 100644 --- a/hw/dummy_m68k.c +++ b/hw/dummy_m68k.c @@ -10,6 +10,7 @@ #include "boards.h" #include "loader.h" #include "elf.h" +#include "exec-memory.h" #define KERNEL_LOAD_ADDR 0x10000 @@ -21,6 +22,8 @@ static void dummy_m68k_init(ram_addr_t ram_size, const char *initrd_filename, const char *cpu_model) { CPUState *env; + MemoryRegion *address_space_mem = get_system_memory(); + MemoryRegion *ram = g_new(MemoryRegion, 1); int kernel_size; uint64_t elf_entry; target_phys_addr_t entry; @@ -37,8 +40,8 @@ static void dummy_m68k_init(ram_addr_t ram_size, env->vbr = 0; /* RAM at address zero */ - cpu_register_physical_memory(0, ram_size, - qemu_ram_alloc(NULL, "dummy_m68k.ram", ram_size) | IO_MEM_RAM); + memory_region_init_ram(ram, NULL, "dummy_m68k.ram", ram_size); + memory_region_add_subregion(address_space_mem, 0, ram); /* Load kernel. */ if (kernel_filename) { -- 1.7.5.3