From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33346 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pa6Y6-00077f-33 for qemu-devel@nongnu.org; Tue, 04 Jan 2011 08:03:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pa6Y4-00056P-RU for qemu-devel@nongnu.org; Tue, 04 Jan 2011 08:03:37 -0500 Received: from mo-p00-ob.rzone.de ([81.169.146.160]:47654) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pa6Y4-00055w-IS for qemu-devel@nongnu.org; Tue, 04 Jan 2011 08:03:36 -0500 From: Kevin Wolf Date: Tue, 4 Jan 2011 14:03:30 +0100 Message-Id: <1294146210-14638-1-git-send-email-mail@kevin-wolf.de> Subject: [Qemu-devel] [PATCH] multiboot: Fix upper memory size in multiboot info List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf The upper memory size field should exclude the first MB of RAM. Signed-off-by: Kevin Wolf --- hw/multiboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/multiboot.c b/hw/multiboot.c index 7cc3055..0d2bfb4 100644 --- a/hw/multiboot.c +++ b/hw/multiboot.c @@ -306,7 +306,7 @@ int load_multiboot(void *fw_cfg, | MULTIBOOT_FLAGS_MODULES | MULTIBOOT_FLAGS_MMAP); stl_p(bootinfo + MBI_MEM_LOWER, 640); - stl_p(bootinfo + MBI_MEM_UPPER, ram_size / 1024); + stl_p(bootinfo + MBI_MEM_UPPER, (ram_size / 1024) - 1024); stl_p(bootinfo + MBI_BOOT_DEVICE, 0x8001ffff); /* XXX: use the -boot switch? */ stl_p(bootinfo + MBI_MMAP_ADDR, ADDR_E820_MAP); -- 1.6.0.2