From patchwork Mon Oct 26 11:18:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 36896 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E8BE5B7BE7 for ; Mon, 26 Oct 2009 22:20:39 +1100 (EST) Received: from localhost ([127.0.0.1]:39837 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N2Ncr-0000Az-4V for incoming@patchwork.ozlabs.org; Mon, 26 Oct 2009 07:20:37 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N2Nax-00085U-5v for qemu-devel@nongnu.org; Mon, 26 Oct 2009 07:18:39 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N2Nar-00084T-I9 for qemu-devel@nongnu.org; Mon, 26 Oct 2009 07:18:37 -0400 Received: from [199.232.76.173] (port=50215 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N2Nar-00084O-D6 for qemu-devel@nongnu.org; Mon, 26 Oct 2009 07:18:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3634) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N2Naq-0003CH-MY for qemu-devel@nongnu.org; Mon, 26 Oct 2009 07:18:33 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9QBIVTm028535 for ; Mon, 26 Oct 2009 07:18:31 -0400 Received: from zweiblum.home.kraxel.org (vpn1-5-193.ams2.redhat.com [10.36.5.193]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n9QBIToO005860; Mon, 26 Oct 2009 07:18:30 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id DF29370109; Mon, 26 Oct 2009 12:18:27 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 26 Oct 2009 12:18:27 +0100 Message-Id: <1256555907-21505-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1256555907-21505-1-git-send-email-kraxel@redhat.com> References: <1256555907-21505-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v4 4/4] use rom loader for pc bios. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The pc bios shows up in 'info roms' now. Note that the BIOS is mapped to two places: The complete rom at the top of the memory, and the first 128k at 0xe0000. Only the first place is listed in 'info roms'. Signed-off-by: Gerd Hoffmann --- hw/pc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 9e34104..6b4e008 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1115,8 +1115,8 @@ static void pc_init1(ram_addr_t ram_size, goto bios_error; } bios_offset = qemu_ram_alloc(bios_size); - ret = load_image(filename, qemu_get_ram_ptr(bios_offset)); - if (ret != bios_size) { + ret = rom_add_file_fixed(bios_name, (uint32_t)(-bios_size)); + if (ret != 0) { bios_error: fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", bios_name); exit(1);