summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-10-26 12:18:27 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-30 08:39:29 -0500
commit7eb4ade31d8594f3a29652183343c3bf50387d27 (patch)
tree2608040d43cd2985584f0c99bc2005b6c0cc092a
parentf8ea6ec89fb244928c93602245f43236ff452cc1 (diff)
downloadqemu-7eb4ade31d8594f3a29652183343c3bf50387d27.tar.gz
qemu-7eb4ade31d8594f3a29652183343c3bf50387d27.tar.bz2
qemu-7eb4ade31d8594f3a29652183343c3bf50387d27.zip
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>
-rw-r--r--hw/pc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 42f7de8c88..acae759e5a 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);