From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Te7ej-0007bx-BG for qemu-devel@nongnu.org; Thu, 29 Nov 2012 12:12:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Te7eb-00057F-TL for qemu-devel@nongnu.org; Thu, 29 Nov 2012 12:12:09 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:35703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Te7eb-00057B-NB for qemu-devel@nongnu.org; Thu, 29 Nov 2012 12:12:01 -0500 Received: by mail-pa0-f45.google.com with SMTP id bg2so7780934pad.4 for ; Thu, 29 Nov 2012 09:12:00 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 29 Nov 2012 18:11:50 +0100 Message-Id: <1354209111-18110-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1.3?] multiboot: fix e801 memory map List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexander Graf The e801 memory sizes in the multiboot structures hard-code the available low memory to 640. However, the value should not include the size of the EBDA. Fill the value in the option ROM, getting the size of low memory from the BIOS. Cc: Alexander Graf Signed-off-by: Paolo Bonzini --- Alex, can you ack this patch for 1.3? pc-bios/multiboot.bin | Bin 1024 -> 1024 bytes pc-bios/optionrom/multiboot.S | 7 +++++++ 2 files changed, 7 insertions(+) diff --git a/pc-bios/multiboot.bin b/pc-bios/multiboot.bin index f74a6e142fddc054d7f40ab346a108532afac40f..7b3c1745a430ea5e0e15b9aa817d1cbbaa40db14 100644 GIT binary patch delta 81 zcmZqRXyBNj#q7o8KT+38L4+xd@o;KdryK*rZVrajPB|8aZaEhwAcKt|ty|7*VtW(k kS)sHUDQSyY7$$Qv{%2ueV91@!$z;eVv)P(y2P2~%0BkrF9smFU delta 72 zcmZqRXyBNj#capqJWgJByEE-zoLs=f!*~_|qXQE} diff --git a/pc-bios/optionrom/multiboot.S b/pc-bios/optionrom/multiboot.S index f08222a..003bcfb 100644 --- a/pc-bios/optionrom/multiboot.S +++ b/pc-bios/optionrom/multiboot.S @@ -75,6 +75,13 @@ run_multiboot: shr $4, %eax mov %ax, %fs + /* Account for the EBDA in the multiboot structure's e801 + * map. + */ + int $0x12 + cwtl + movl %eax, %fs:4 + /* ES = mmap_addr */ mov %fs:48, %eax shr $4, %eax -- 1.8.0