From: Gerd Hoffmann <[email protected]> Use the new helper function instead of open-coding the shim image load.
Signed-off-by: Gerd Hoffmann <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-id: [email protected] Signed-off-by: Peter Maydell <[email protected]> --- hw/i386/x86-common.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c index fde05fa7d7..8f9419e7d3 100644 --- a/hw/i386/x86-common.c +++ b/hw/i386/x86-common.c @@ -980,19 +980,8 @@ void x86_load_linux(X86MachineState *x86ms, fw_cfg_add_file(fw_cfg, "etc/boot/kernel", kernel, kernel_size); if (machine->shim_filename) { - GMappedFile *mapped_file; - GError *gerr = NULL; - - mapped_file = g_mapped_file_new(machine->shim_filename, false, &gerr); - if (!mapped_file) { - fprintf(stderr, "qemu: error reading shim %s: %s\n", - machine->shim_filename, gerr->message); - exit(1); - } - - fw_cfg_add_file(fw_cfg, "etc/boot/shim", - g_mapped_file_get_contents(mapped_file), - g_mapped_file_get_length(mapped_file)); + load_image_to_fw_cfg_file(fw_cfg, "etc/boot/shim", + machine->shim_filename); } if (sev_enabled()) { -- 2.43.0
