ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i386: move bios load error message 

Switch to usual goto-end-of-function error handling style.
No functional change.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Xiaoyao Li <xiaoyao.li@intel.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20220425135051.551037-2-kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2022-04-25 15:50:49 +02:00
parent 0d90da8203
commit 2aa6a39bc8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/i386/x86.c
View File

@ -1120,9 +1120,7 @@ void x86_bios_rom_init(MachineState *ms, const char *default_firmware,
} }
ret = rom_add_file_fixed(bios_name, (uint32_t)(-bios_size), -1); ret = rom_add_file_fixed(bios_name, (uint32_t)(-bios_size), -1);
if (ret != 0) { if (ret != 0) {
bios_error: goto bios_error;
fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", bios_name);
exit(1);
} }
g_free(filename); g_free(filename);
@ -1143,6 +1141,11 @@ void x86_bios_rom_init(MachineState *ms, const char *default_firmware,
memory_region_add_subregion(rom_memory, memory_region_add_subregion(rom_memory,
(uint32_t)(-bios_size), (uint32_t)(-bios_size),
bios); bios);
return;
bios_error:
fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", bios_name);
exit(1);
} }
bool x86_machine_is_smm_enabled(const X86MachineState *x86ms) bool x86_machine_is_smm_enabled(const X86MachineState *x86ms)