diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-26 10:30:18 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-12-10 12:15:05 -0500 |
| commit | 7d435078afa08eb136bdcdc4f199fd26ddbc353b (patch) | |
| tree | 24dd70d2157eec541c35b342a807d96ce4baca90 /hw/i386/x86.c | |
| parent | b57e3e9785271a20b00f43d469b3011d0127e565 (diff) | |
| download | qemu-7d435078afa08eb136bdcdc4f199fd26ddbc353b.zip qemu-7d435078afa08eb136bdcdc4f199fd26ddbc353b.tar.gz qemu-7d435078afa08eb136bdcdc4f199fd26ddbc353b.tar.bz2 | |
i386: remove bios_name
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20201026143028.3034018-6-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/i386/x86.c')
| -rw-r--r-- | hw/i386/x86.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 7c1f64a..f86f6db 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -55,8 +55,6 @@ #include CONFIG_DEVICES #include "kvm_i386.h" -#define BIOS_FILENAME "bios.bin" - /* Physical Address of PVH entry point read from kernel ELF NOTE */ static size_t pvh_start_addr; @@ -1080,17 +1078,17 @@ void x86_load_linux(X86MachineState *x86ms, nb_option_roms++; } -void x86_bios_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) +void x86_bios_rom_init(MachineState *ms, const char *default_firmware, + MemoryRegion *rom_memory, bool isapc_ram_fw) { + const char *bios_name; char *filename; MemoryRegion *bios, *isa_bios; int bios_size, isa_bios_size; int ret; /* BIOS load */ - if (bios_name == NULL) { - bios_name = BIOS_FILENAME; - } + bios_name = ms->firmware ?: default_firmware; filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); if (filename) { bios_size = get_image_size(filename); |