From patchwork Wed Aug 24 10:11:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 111317 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 10D09B6F6F for ; Wed, 24 Aug 2011 21:24:34 +1000 (EST) Received: from localhost ([::1]:37062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwARn-0006fs-3w for incoming@patchwork.ozlabs.org; Wed, 24 Aug 2011 06:12:35 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwAQz-0005ew-Rz for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwAQm-0006GE-OS for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63896) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwAQl-0006FA-Cx 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 p7OABUc2006106 (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 p7OABTlu015213 for ; Wed, 24 Aug 2011 06:11:30 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 992BE250B63; Wed, 24 Aug 2011 13:11:26 +0300 (IDT) From: Avi Kivity To: qemu-devel@nongnu.org Date: Wed, 24 Aug 2011 13:11:23 +0300 Message-Id: <1314180683-8227-25-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 24/24] milkymist: 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/milkymist.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/milkymist.c b/hw/milkymist.c index 74994a7..09de681 100644 --- a/hw/milkymist.c +++ b/hw/milkymist.c @@ -85,7 +85,7 @@ milkymist_init(MemoryRegion *address_space_mem, CPUState *env; int kernel_size; DriveInfo *dinfo; - ram_addr_t phys_sdram; + MemoryRegion *phys_sdram = g_new(MemoryRegion, 1); MemoryRegion *phys_flash = g_new(MemoryRegion, 1); qemu_irq irq[32], *cpu_irq; int i; @@ -113,9 +113,8 @@ milkymist_init(MemoryRegion *address_space_mem, cpu_lm32_set_phys_msb_ignore(env, 1); - phys_sdram = qemu_ram_alloc(NULL, "milkymist.sdram", sdram_size); - cpu_register_physical_memory(sdram_base, sdram_size, - phys_sdram | IO_MEM_RAM); + memory_region_init_ram(phys_sdram, NULL, "milkymist.sdram", sdram_size); + memory_region_add_subregion(address_space_mem, sdram_base, phys_sdram); memory_region_init_rom_device(phys_flash, &pflash_cfi01_ops_be, NULL, "milkymist.flash", flash_size);