From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MynPr-0006Lc-Ki for qemu-devel@nongnu.org; Fri, 16 Oct 2009 10:04:23 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MynPm-0006Em-RB for qemu-devel@nongnu.org; Fri, 16 Oct 2009 10:04:22 -0400 Received: from [199.232.76.173] (port=42697 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MynPm-0006ES-9u for qemu-devel@nongnu.org; Fri, 16 Oct 2009 10:04:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57325) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MynPl-0002eK-IQ for qemu-devel@nongnu.org; Fri, 16 Oct 2009 10:04:17 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9GE4GXn028262 for ; Fri, 16 Oct 2009 10:04:16 -0400 From: Gerd Hoffmann Date: Fri, 16 Oct 2009 16:04:11 +0200 Message-Id: <1255701851-11147-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1255701851-11147-1-git-send-email-kraxel@redhat.com> References: <1255701851-11147-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] use rom loader for pc bios. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 7fcc4b0..9a9d196 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); -- 1.6.2.5