Message ID | 1418087585-27601-8-git-send-email-lersek@redhat.com |
---|---|
State | New |
Headers | show |
On 9 December 2014 at 01:13, Laszlo Ersek <lersek@redhat.com> wrote: > 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> thanks -- PMM
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 274aaae..0b5ad7c 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -632,8 +632,9 @@ static void machvirt_init(MachineState *machine) vbi->bootinfo.nb_cpus = smp_cpus; 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); } static QEMUMachine machvirt_a15_machine = {
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> --- Notes: v3: - unchanged hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+)