From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 26 Oct 2009 11:18:27 +0000 (+0100)
Subject: use rom loader for pc bios.
X-Git-Tag: v0.12.0-rc0~441
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51edd4e6b5a5dfbe168f21ff7cdc5d63e16c160b;p=thirdparty%2Fqemu.git

use rom loader for pc bios.

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 <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/pc.c b/hw/pc.c
index 42f7de8c88f..acae759e5ad 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);