From: Laszlo Ersek Date: Mon, 22 Dec 2014 12:11:45 +0000 (+0100) Subject: hw/arm/virt: enable passing of EFI-stubbed kernel to guest UEFI firmware X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=aa351061dbb0e3054db11c00a69395785c4186c8;p=qemu.git hw/arm/virt: enable passing of EFI-stubbed kernel to guest UEFI firmware The virt board already ensures mutual exclusion between -bios and -pflash unit#0; we only need to set "bootinfo.firmware_loaded", introduced in the previous patch, if either of those options was used to load the guest firmware. Signed-off-by: Laszlo Ersek Reviewed-by: Peter Maydell Signed-off-by: Paolo Bonzini Message-id: 1419250305-31062-12-git-send-email-pbonzini@redhat.com Signed-off-by: Peter Maydell --- diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 183bf2023d..235344034d 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -656,6 +656,7 @@ static void machvirt_init(MachineState *machine) vbi->bootinfo.board_id = -1; vbi->bootinfo.loader_start = vbi->memmap[VIRT_MEM].base; vbi->bootinfo.get_dtb = machvirt_dtb; + vbi->bootinfo.firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0); arm_load_kernel(ARM_CPU(first_cpu), &vbi->bootinfo); }