From patchwork Sun Jul 11 18:09:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 111333 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6BI9ZH5023910 for ; Sun, 11 Jul 2010 18:09:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754619Ab0GKSJd (ORCPT ); Sun, 11 Jul 2010 14:09:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42524 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754267Ab0GKSJc (ORCPT ); Sun, 11 Jul 2010 14:09:32 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6BI9V1B016680 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 11 Jul 2010 14:09:31 -0400 Received: from localhost6.localdomain6 (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6BI9Utm032382; Sun, 11 Jul 2010 14:09:30 -0400 From: Alex Williamson Subject: [RFC PATCH 3/5] RAM API: Make use of it for x86 PC To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: pugs@cisco.com, chrisw@redhat.com, mst@redhat.com, alex.williamson@redhat.com Date: Sun, 11 Jul 2010 12:09:29 -0600 Message-ID: <20100711180929.20121.19946.stgit@localhost6.localdomain6> In-Reply-To: <20100711180910.20121.93313.stgit@localhost6.localdomain6> References: <20100711180910.20121.93313.stgit@localhost6.localdomain6> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 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 (demeter.kernel.org [140.211.167.41]); Sun, 11 Jul 2010 18:09:35 +0000 (UTC) diff --git a/hw/pc.c b/hw/pc.c index a96187f..b9ce6ae 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -911,13 +911,13 @@ 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 - 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 /* BIOS load */