From patchwork Thu Nov 18 21:41:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 72155 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 42C1DB71DA for ; Fri, 19 Nov 2010 09:11:18 +1100 (EST) Received: from [127.0.0.1] (port=33344 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PJCHc-0006NB-Pa for incoming@patchwork.ozlabs.org; Thu, 18 Nov 2010 16:44:44 -0500 Received: from [140.186.70.92] (port=42983 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PJCEx-0005hU-TK for qemu-devel@nongnu.org; Thu, 18 Nov 2010 16:42:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PJCEw-0003O8-6z for qemu-devel@nongnu.org; Thu, 18 Nov 2010 16:41:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3477) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PJCEw-0003O3-09 for qemu-devel@nongnu.org; Thu, 18 Nov 2010 16:41:58 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAILftPO029637 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 18 Nov 2010 16:41:55 -0500 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oAILfshl019778; Thu, 18 Nov 2010 16:41:54 -0500 From: Alex Williamson To: qemu-devel@nongnu.org, anthony@codemonkey.ws Date: Thu, 18 Nov 2010 14:41:54 -0700 Message-ID: <20101118214147.25456.50778.stgit@s20.home> In-Reply-To: <20101118213642.25456.42761.stgit@s20.home> References: <20101118213642.25456.42761.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: alex.williamson@redhat.com, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v3 2/2] RAM API: Make use of it for x86 PC X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Register the actual VM RAM using the new API Signed-off-by: Alex Williamson --- hw/pc.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 69b13bf..fb7ee21 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -912,14 +912,11 @@ void pc_memory_init(ram_addr_t ram_size, /* allocate RAM */ ram_addr = qemu_ram_alloc(NULL, "pc.ram", below_4g_mem_size + above_4g_mem_size); - cpu_register_physical_memory(0, 0xa0000, ram_addr); - cpu_register_physical_memory(0x100000, - below_4g_mem_size - 0x100000, - ram_addr + 0x100000); + qemu_ram_register(0, below_4g_mem_size, ram_addr); #if TARGET_PHYS_ADDR_BITS > 32 if (above_4g_mem_size > 0) { - cpu_register_physical_memory(0x100000000ULL, above_4g_mem_size, - ram_addr + below_4g_mem_size); + qemu_ram_register(0x100000000ULL, above_4g_mem_size, + ram_addr + below_4g_mem_size); } #endif