From patchwork Sun Jul 24 10:14:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?G=C3=B6ran_Weinholt?= X-Patchwork-Id: 106510 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2127EB6F64 for ; Sun, 24 Jul 2011 20:20:06 +1000 (EST) Received: from localhost ([::1]:47346 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qkvn1-0007f6-B7 for incoming@patchwork.ozlabs.org; Sun, 24 Jul 2011 06:20:03 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qkvmw-0007ey-20 for qemu-devel@nongnu.org; Sun, 24 Jul 2011 06:19:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qkvmu-0006sj-QF for qemu-devel@nongnu.org; Sun, 24 Jul 2011 06:19:58 -0400 Received: from gula.weinholt.se ([95.80.32.2]:34181 helo=mail.weinholt.se) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qkvmu-0006rz-2P for qemu-devel@nongnu.org; Sun, 24 Jul 2011 06:19:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=weinholt.se; s=gula2011; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date:Subject:To:From; bh=zZsh6/oAZK8ZwFNhcarbJ9pv4IgbDMl7xBGxBnuiD/M=; b=DIXBIw6HTeHzO7UqbENddyflUCY8QARMWSs2D2m18Auap4L3iAV4tlj4zjTqB2rak9/TJyAx8xue5OeHuzd/r5gzCViqWhQDAueUz7qHtuYR8nhfBY28kwZXcjmOC/DY3AHqvgtshknjTBK9x+bXPuo0imohdLT9Y88P4YCEexUmk5y+2B+c+sXgHdbaZzgF6v+/3oy6QYk858MNRa0DE9cUSxVsbcVrIDVybZ8/u5io+c/+jWSG0sXfuKhlD4b8; Received: from Uindustria by mail.weinholt.se with local-bsmtp (Exim 4.72) (envelope-from ) id 1Qkvmk-0007BD-Fr; Sun, 24 Jul 2011 12:19:46 +0200 Received: from weinholt by localhost with local (Exim 4.72) (envelope-from ) id 1Qkvi1-0003Y2-NR; Sun, 24 Jul 2011 12:14:53 +0200 X-Hashcash: 1:20:110724:qemu-devel@nongnu.org::lPcvZ6gjVdKCssBv:00000000000000000000000000000000000000002AKK From: =?utf-8?Q?G=C3=B6ran?= Weinholt To: qemu-devel@nongnu.org Date: Sun, 24 Jul 2011 12:14:53 +0200 Message-ID: <87ei1ggf36.fsf@industria.weinholt.se> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 95.80.32.2 Subject: [Qemu-devel] [PATCH] multiboot: Fix bss segment support 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 Multiboot images can specify a bss segment. The boot loader must clear the memory of the bss and ensure that no modules or structures are allocated inside it. Several fields are provided in the Multiboot header that were previously not used properly. The header is now used to determine how much data should be read from the image and how much memory should be reserved to the bss segment. Signed-off-by: Göran Weinholt --- hw/multiboot.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/multiboot.c b/hw/multiboot.c index 2426e84..4cff6aa 100644 --- a/hw/multiboot.c +++ b/hw/multiboot.c @@ -198,11 +198,13 @@ int load_multiboot(void *fw_cfg, } else { /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_ADDR. */ uint32_t mh_header_addr = ldl_p(header+i+12); + uint32_t mh_load_end_addr = ldl_p(header+i+20); + uint32_t mh_bss_end_addr = ldl_p(header+i+24); mh_load_addr = ldl_p(header+i+16); uint32_t mb_kernel_text_offset = i - (mh_header_addr - mh_load_addr); mh_entry_addr = ldl_p(header+i+28); - mb_kernel_size = kernel_file_size - mb_kernel_text_offset; + mb_kernel_size = mh_load_end_addr - mh_load_addr; /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_VBE. uint32_t mh_mode_type = ldl_p(header+i+32); @@ -212,8 +214,8 @@ int load_multiboot(void *fw_cfg, mb_debug("multiboot: mh_header_addr = %#x\n", mh_header_addr); mb_debug("multiboot: mh_load_addr = %#x\n", mh_load_addr); - mb_debug("multiboot: mh_load_end_addr = %#x\n", ldl_p(header+i+20)); - mb_debug("multiboot: mh_bss_end_addr = %#x\n", ldl_p(header+i+24)); + mb_debug("multiboot: mh_load_end_addr = %#x\n", mh_load_end_addr); + mb_debug("multiboot: mh_bss_end_addr = %#x\n", mh_bss_end_addr); mb_debug("qemu: loading multiboot kernel (%#x bytes) at %#x\n", mb_kernel_size, mh_load_addr); @@ -224,6 +226,7 @@ int load_multiboot(void *fw_cfg, exit(1); } fclose(f); + mb_kernel_size = mh_bss_end_addr - mh_load_addr; } mbs.mb_buf_phys = mh_load_addr;