From: Kevin Wolf <mail@kevin-wolf.de>
Date: Tue, 4 Jan 2011 13:03:30 +0000 (+0100)
Subject: multiboot: Fix upper memory size in multiboot info
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0bfe006c5380c5f8a485a55ded3329fbbc224396;p=qemu.git

multiboot: Fix upper memory size in multiboot info

The upper memory size field should exclude the first MB of RAM.

Signed-off-by: Kevin Wolf <mail@kevin-wolf.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/hw/multiboot.c b/hw/multiboot.c
index 7cc3055359..0d2bfb4973 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);