aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2014-12-22 13:11:45 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-12-22 23:39:20 +0000
commitaa351061dbb0e3054db11c00a69395785c4186c8 (patch)
tree60ce36a65b0582afdd0cadbe7097111d36580f4b
parent07abe45c4814d42f3aca879d7932c5bc90d98bdf (diff)
downloadqemu-arm-pull-target-arm-20141223.tar.gz
hw/arm/virt: enable passing of EFI-stubbed kernel to guest UEFI firmwarepull-target-arm-20141223
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 <lersek@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 1419250305-31062-12-git-send-email-pbonzini@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--hw/arm/virt.c1
1 files changed, 1 insertions, 0 deletions
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);
}