[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 31/31] hw/arm/virt: enable passing of EFI-stubbed ker
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 31/31] hw/arm/virt: enable passing of EFI-stubbed kernel to guest UEFI firmware |
Date: |
Tue, 23 Dec 2014 13:54:27 +0000 |
From: Laszlo Ersek <address@hidden>
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 <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/virt.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 183bf20..2353440 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);
}
--
1.9.1
- [Qemu-devel] [PULL 00/31] target-arm queue, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 28/31] arm: add fw_cfg to "virt" board, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 31/31] hw/arm/virt: enable passing of EFI-stubbed kernel to guest UEFI firmware,
Peter Maydell <=
- [Qemu-devel] [PULL 08/31] target-arm: Switch to common vexpress machine init, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 13/31] target-arm: Add feature unset function, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 10/31] target-arm: Change vexpress daughterboard init arg, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 03/31] machine: remove qemu_machine_opts global list, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 30/31] hw/arm: pass pristine kernel image to guest firmware over fw_cfg, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 25/31] exec: allows 8-byte accesses in subpage_ops, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 23/31] fw_cfg_mem: max access size and region size are the same for data register, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 26/31] fw_cfg_mem: introduce the "data_width" property, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 17/31] target-arm: Set CPU has_el3 prop during virt init, Peter Maydell, 2014/12/23
- [Qemu-devel] [PULL 20/31] target-arm: add cpu feature EL3 to CPUs with Security Extensions, Peter Maydell, 2014/12/23