From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzScw-00081k-Od for qemu-devel@nongnu.org; Fri, 12 Dec 2014 10:59:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzScr-0003DH-U0 for qemu-devel@nongnu.org; Fri, 12 Dec 2014 10:59:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzScr-0003D9-NF for qemu-devel@nongnu.org; Fri, 12 Dec 2014 10:59:29 -0500 From: Laszlo Ersek Date: Fri, 12 Dec 2014 16:58:52 +0100 Message-Id: <1418399932-7658-9-git-send-email-lersek@redhat.com> In-Reply-To: <1418399932-7658-1-git-send-email-lersek@redhat.com> References: <1418399932-7658-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [PATCH v4 8/8] hw/arm/virt: enable passing of EFI-stubbed kernel to guest UEFI firmware List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org, qemu-devel@nongnu.org, rjones@redhat.com, drjones@redhat.com, lersek@redhat.com 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 Reviewed-by: Peter Maydell --- Notes: v4: - unchanged v3: - unchanged hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+) 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 = { -- 1.8.3.1