From patchwork Mon Nov 1 15:14:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 69813 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 17B8C1007D2 for ; Tue, 2 Nov 2010 03:29:19 +1100 (EST) Received: from localhost ([127.0.0.1]:55612 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PCxFz-0000jc-Ex for incoming@patchwork.ozlabs.org; Mon, 01 Nov 2010 12:29:15 -0400 Received: from [140.186.70.92] (port=46558 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PCw60-0003lr-Hp for qemu-devel@nongnu.org; Mon, 01 Nov 2010 11:14:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PCw5m-0002vZ-Bs for qemu-devel@nongnu.org; Mon, 01 Nov 2010 11:14:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20932) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PCw5m-0002vJ-4u for qemu-devel@nongnu.org; Mon, 01 Nov 2010 11:14:38 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oA1FEXkn023279 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 1 Nov 2010 11:14:33 -0400 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oA1FEWO1019673; Mon, 1 Nov 2010 11:14:32 -0400 From: Alex Williamson To: qemu-devel@nongnu.org, anthony@codemonkey.ws, blauwirbel@gmail.com Date: Mon, 01 Nov 2010 09:14:32 -0600 Message-ID: <20101101151415.3927.87944.stgit@s20.home> In-Reply-To: <20101101150701.3927.88854.stgit@s20.home> References: <20101101150701.3927.88854.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: chrisw@redhat.com, alex.williamson@redhat.com, ddutile@redhat.com, kvm@vger.kernel.org, mst@redhat.com Subject: [Qemu-devel] [PATCH v2 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 | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 69b13bf..0ea6d10 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -912,14 +912,14 @@ 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, 0xa0000, ram_addr); + qemu_ram_register(0x100000, below_4g_mem_size - 0x100000, + ram_addr + 0x100000); #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