From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=44167 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OSCvK-0002Dc-Ey for qemu-devel@nongnu.org; Fri, 25 Jun 2010 13:42:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OSCOX-00060a-Fj for qemu-devel@nongnu.org; Fri, 25 Jun 2010 13:08:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47344) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OSCOX-00060Q-7y for qemu-devel@nongnu.org; Fri, 25 Jun 2010 13:08:49 -0400 From: Alex Williamson Date: Fri, 25 Jun 2010 11:08:45 -0600 Message-ID: <20100625170845.8325.18485.stgit@localhost.localdomain> In-Reply-To: <20100625170544.8325.62081.stgit@localhost.localdomain> References: <20100625170544.8325.62081.stgit@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v2 02/16] pc: Allocate all ram in a single qemu_ram_alloc() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com This will benefit us when we migrate based on ramblock name since we won't be bouncing between separate blocks. Signed-off-by: Alex Williamson --- hw/pc.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 1848151..d6f3aa4 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -893,27 +893,23 @@ void pc_memory_init(ram_addr_t ram_size, *above_4g_mem_size_p = above_4g_mem_size; *below_4g_mem_size_p = below_4g_mem_size; +#if TARGET_PHYS_ADDR_BITS == 32 + if (above_4g_mem_size > 0) { + hw_error("To much RAM for 32-bit physical address"); + } +#endif linux_boot = (kernel_filename != NULL); /* allocate RAM */ - ram_addr = qemu_ram_alloc(below_4g_mem_size); + ram_addr = qemu_ram_alloc(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); - - /* above 4giga memory allocation */ - if (above_4g_mem_size > 0) { -#if TARGET_PHYS_ADDR_BITS == 32 - hw_error("To much RAM for 32-bit physical address"); -#else - ram_addr = qemu_ram_alloc(above_4g_mem_size); - cpu_register_physical_memory(0x100000000ULL, - above_4g_mem_size, - ram_addr); +#if TARGET_PHYS_ADDR_BITS > 32 + cpu_register_physical_memory(0x100000000ULL, above_4g_mem_size, + ram_addr + below_4g_mem_size); #endif - } - /* BIOS load */ if (bios_name == NULL)