From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdJ5v-0005eL-T9 for qemu-devel@nongnu.org; Mon, 04 Nov 2013 07:17:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdJ5o-0007su-Tp for qemu-devel@nongnu.org; Mon, 04 Nov 2013 07:17:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdJ5o-0007sk-MS for qemu-devel@nongnu.org; Mon, 04 Nov 2013 07:17:16 -0500 From: Gerd Hoffmann Date: Mon, 4 Nov 2013 13:17:11 +0100 Message-Id: <1383567431-13540-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1383567431-13540-1-git-send-email-kraxel@redhat.com> References: <1383567431-13540-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] pc: register e820 entries for ram List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Andrea Arcangeli , Gerd Hoffmann , Anthony Liguori So RAM shows up in the new etc/e820 fw_cfg file. Cc: Andrea Arcangeli Signed-off-by: Gerd Hoffmann --- hw/i386/pc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a653ae4..12c436e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1174,13 +1174,7 @@ FWCfgState *pc_memory_init(MemoryRegion *system_memory, memory_region_init_alias(ram_below_4g, NULL, "ram-below-4g", ram, 0, below_4g_mem_size); memory_region_add_subregion(system_memory, 0, ram_below_4g); - if (0) { - /* - * Ideally we should do that too, but that would ruin the e820 - * reservations added by seabios before initializing fw_cfg. - */ - e820_add_entry(0, below_4g_mem_size, E820_RAM); - } + e820_add_entry(0, below_4g_mem_size, E820_RAM); if (above_4g_mem_size > 0) { ram_above_4g = g_malloc(sizeof(*ram_above_4g)); memory_region_init_alias(ram_above_4g, NULL, "ram-above-4g", ram, -- 1.8.3.1