From patchwork Mon Dec 13 20:47:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 407572 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBDKm2cb025696 for ; Mon, 13 Dec 2010 20:48:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755549Ab0LMUr7 (ORCPT ); Mon, 13 Dec 2010 15:47:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8814 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754676Ab0LMUr7 (ORCPT ); Mon, 13 Dec 2010 15:47:59 -0500 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.13.8/8.13.8) with ESMTP id oBDKluE2030813 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 13 Dec 2010 15:47:56 -0500 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBDKltJm008337; Mon, 13 Dec 2010 15:47:55 -0500 From: Alex Williamson Subject: [RESEND PATCH v3 2/2] RAM API: Make use of it for x86 PC To: qemu-devel@nongnu.org, anthony@codemonkey.ws Cc: kvm@vger.kernel.org, alex.williamson@redhat.com Date: Mon, 13 Dec 2010 13:47:55 -0700 Message-ID: <20101213204752.19493.51029.stgit@s20.home> In-Reply-To: <20101213204540.19493.92979.stgit@s20.home> References: <20101213204540.19493.92979.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 13 Dec 2010 20:48:03 +0000 (UTC) diff --git a/hw/pc.c b/hw/pc.c index e1b2667..1554164 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -913,14 +913,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