From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Alex Williamson 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> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v2 2/2] RAM API: Make use of it for x86 PC List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, anthony@codemonkey.ws, blauwirbel@gmail.com Cc: chrisw@redhat.com, alex.williamson@redhat.com, ddutile@redhat.com, kvm@vger.kernel.org, mst@redhat.com 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