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/microvm.c | |
| parent | b57e3e9785271a20b00f43d469b3011d0127e565 (diff) | |
| download | focaccia-qemu-7d435078afa08eb136bdcdc4f199fd26ddbc353b.tar.gz focaccia-qemu-7d435078afa08eb136bdcdc4f199fd26ddbc353b.zip | |
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/microvm.c')
| -rw-r--r-- | hw/i386/microvm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 5688608613..f111ef87d8 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -158,6 +158,7 @@ static int microvm_ioapics(MicrovmMachineState *mms) static void microvm_devices_init(MicrovmMachineState *mms) { + const char *default_firmware; X86MachineState *x86ms = X86_MACHINE(mms); ISABus *isa_bus; ISADevice *rtc_state; @@ -274,12 +275,10 @@ static void microvm_devices_init(MicrovmMachineState *mms) serial_hds_isa_init(isa_bus, 0, 1); } - if (bios_name == NULL) { - bios_name = x86_machine_is_acpi_enabled(x86ms) + default_firmware = x86_machine_is_acpi_enabled(x86ms) ? MICROVM_BIOS_FILENAME : MICROVM_QBOOT_FILENAME; - } - x86_bios_rom_init(get_system_memory(), true); + x86_bios_rom_init(MACHINE(mms), default_firmware, get_system_memory(), true); } static void microvm_memory_init(MicrovmMachineState *mms) |