Commit aa351061 authored by Laszlo Ersek's avatar Laszlo Ersek Committed by Peter Maydell
Browse files

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: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1419250305-31062-12-git-send-email-pbonzini@redhat.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 07abe45c

hw/arm/virt.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}