From patchwork Thu Nov 29 17:11:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 202786 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 951802C00B1 for ; Fri, 30 Nov 2012 04:12:20 +1100 (EST) Received: from localhost ([::1]:47410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Te7es-0007cg-DS for incoming@patchwork.ozlabs.org; Thu, 29 Nov 2012 12:12:18 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=fpMPhAu5ruIITPxsUtJpC2BNUdoUdbvmJSG1oaSN6Yg=; b=TK2ddo+cp1O+Prrg/c7CeJw/g599xfu59d2iUhaTGWXc+k1PbgqcqoFr4XnwshJGqw Qdf3Vf0zanGLO9t6Bbyo/kmLW/VguZh53gxBC0dsgcZvVQlBN2adtAoklkGL42+HUMjS 8O0RygsKJ3J7xtRzbzDYxslVZpmpsX1grQkR5MWqJs8xGTpGk1kL9rp6iktkb3ed+t27 zMzE/x3apVVdxa6FiBzfmSKnGShFW97H2LhbQ5s4ny+MkNCPzw2Lf5iNRkCklmIi/eN8 7uICvAy/XLzxIAVkrNalReByHw7W5uTkX7aIhcfLPiJXUYyV0s8IeaxLSq2r8ThsRwGk yorw== Received: by 10.66.87.202 with SMTP id ba10mr63190665pab.72.1354209120526; Thu, 29 Nov 2012 09:12:00 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id o1sm1359681paw.0.2012.11.29.09.11.57 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 29 Nov 2012 09:11:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 29 Nov 2012 18:11:50 +0100 Message-Id: <1354209111-18110-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.220.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 1.3?] multiboot: fix e801 memory map X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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