From patchwork Wed Feb 24 21:11:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 81834 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1OLGmPA003646 for ; Wed, 24 Feb 2010 21:16:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758136Ab0BXVQh (ORCPT ); Wed, 24 Feb 2010 16:16:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38506 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758119Ab0BXVQf (ORCPT ); Wed, 24 Feb 2010 16:16:35 -0500 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 o1OLGU6g002871 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 24 Feb 2010 16:16:30 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o1OLGT8f011619; Wed, 24 Feb 2010 16:16:30 -0500 Received: from amt.cnet (vpn-11-25.rdu.redhat.com [10.11.11.25]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o1OLGSGh006795; Wed, 24 Feb 2010 16:16:28 -0500 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 4B5ED66E10D; Wed, 24 Feb 2010 18:15:44 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id o1OLFhMT014262; Wed, 24 Feb 2010 18:15:43 -0300 Message-Id: <20100224211507.671656939@amt.cnet> User-Agent: quilt/0.47-1 Date: Wed, 24 Feb 2010 18:11:19 -0300 From: Marcelo Tosatti To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: avi@redhat.com Subject: [patch uq/master 1/2] Allocate memory below 4GB as one chunk References: <20100224211117.958583246@amt.cnet> Content-Disposition: inline; filename=one-4gb-area.patch 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]); Wed, 24 Feb 2010 21:16:49 +0000 (UTC) Index: qemu-kvm/hw/pc.c =================================================================== --- qemu-kvm.orig/hw/pc.c +++ qemu-kvm/hw/pc.c @@ -798,18 +798,11 @@ static void pc_init1(ram_addr_t ram_size vmport_init(); /* allocate RAM */ - ram_addr = qemu_ram_alloc(0xa0000); + ram_addr = qemu_ram_alloc(below_4g_mem_size); cpu_register_physical_memory(0, 0xa0000, ram_addr); - - /* Allocate, even though we won't register, so we don't break the - * phys_ram_base + PA assumption. This range includes vga (0xa0000 - 0xc0000), - * and some bios areas, which will be registered later - */ - ram_addr = qemu_ram_alloc(0x100000 - 0xa0000); - ram_addr = qemu_ram_alloc(below_4g_mem_size - 0x100000); cpu_register_physical_memory(0x100000, below_4g_mem_size - 0x100000, - ram_addr); + ram_addr + 0x100000); /* above 4giga memory allocation */ if (above_4g_mem_size > 0) {