From patchwork Wed Aug 24 10:11:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 111324 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C5CEEB6F68 for ; Wed, 24 Aug 2011 21:38:52 +1000 (EST) Received: from localhost ([::1]:36092 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwARS-00068s-1o for incoming@patchwork.ozlabs.org; Wed, 24 Aug 2011 06:12:14 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwAQw-0005Tg-3g for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwAQm-0006GN-R8 for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52905) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwAQl-0006EM-3h for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:31 -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 p7OABUc0023486 (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 p7OABSqA015196 for ; Wed, 24 Aug 2011 06:11:29 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 8D3FF250B5C; Wed, 24 Aug 2011 13:11:26 +0300 (IDT) From: Avi Kivity To: qemu-devel@nongnu.org Date: Wed, 24 Aug 2011 13:11:16 +0300 Message-Id: <1314180683-8227-18-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 17/24] dummy_m68k: convert to memory API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Avi Kivity --- hw/dummy_m68k.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c index 2de69ad..609d04c 100644 --- a/hw/dummy_m68k.c +++ b/hw/dummy_m68k.c @@ -6,6 +6,7 @@ * This code is licensed under the GPL */ +#include #include "hw.h" #include "boards.h" #include "loader.h" @@ -23,6 +24,7 @@ static void dummy_m68k_init(MemoryRegion *address_space_mem, const char *initrd_filename, const char *cpu_model) { CPUState *env; + MemoryRegion *ram = g_new(MemoryRegion, 1); int kernel_size; uint64_t elf_entry; target_phys_addr_t entry; @@ -39,8 +41,8 @@ static void dummy_m68k_init(MemoryRegion *address_space_mem, 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) {