|
 |
391fb8 |
From 6eaafa0eea15df4439488b535f4d53216e720857 Mon Sep 17 00:00:00 2001
|
|
|
391fb8 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
391fb8 |
Date: Mon, 22 Dec 2014 13:11:45 +0100
|
|
|
391fb8 |
Subject: [PATCH 14/15] hw/arm/virt: enable passing of EFI-stubbed kernel to
|
|
|
391fb8 |
guest UEFI firmware
|
|
|
391fb8 |
|
|
|
391fb8 |
The virt board already ensures mutual exclusion between -bios and -pflash
|
|
|
391fb8 |
unit#0; we only need to set "bootinfo.firmware_loaded", introduced in the
|
|
|
391fb8 |
previous patch, if either of those options was used to load the guest
|
|
|
391fb8 |
firmware.
|
|
|
391fb8 |
|
|
|
391fb8 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
391fb8 |
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
391fb8 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
391fb8 |
Message-id: 1419250305-31062-12-git-send-email-pbonzini@redhat.com
|
|
|
391fb8 |
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
391fb8 |
(cherry picked from commit aa351061dbb0e3054db11c00a69395785c4186c8)
|
|
|
391fb8 |
---
|
|
|
391fb8 |
hw/arm/virt.c | 1 +
|
|
|
391fb8 |
1 file changed, 1 insertion(+)
|
|
|
391fb8 |
|
|
|
391fb8 |
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
|
391fb8 |
index 8af4aa0..29fbdc1 100644
|
|
|
391fb8 |
--- a/hw/arm/virt.c
|
|
|
391fb8 |
+++ b/hw/arm/virt.c
|
|
|
391fb8 |
@@ -633,6 +633,7 @@ static void machvirt_init(MachineState *machine)
|
|
|
391fb8 |
vbi->bootinfo.board_id = -1;
|
|
|
391fb8 |
vbi->bootinfo.loader_start = vbi->memmap[VIRT_MEM].base;
|
|
|
391fb8 |
vbi->bootinfo.get_dtb = machvirt_dtb;
|
|
|
391fb8 |
+ vbi->bootinfo.firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0);
|
|
|
391fb8 |
arm_load_kernel(ARM_CPU(first_cpu), &vbi->bootinfo);
|
|
|
391fb8 |
}
|
|
|
391fb8 |
|
|
|
391fb8 |
--
|
|
|
391fb8 |
2.1.0
|
|
|
391fb8 |
|