From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y31qs-00016a-4t for qemu-devel@nongnu.org; Mon, 22 Dec 2014 07:12:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y31qk-0002Ft-Ot for qemu-devel@nongnu.org; Mon, 22 Dec 2014 07:12:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56739) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y31qk-0002Fm-IO for qemu-devel@nongnu.org; Mon, 22 Dec 2014 07:12:34 -0500 From: Paolo Bonzini Date: Mon, 22 Dec 2014 13:11:45 +0100 Message-Id: <1419250305-31062-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1419250305-31062-1-git-send-email-pbonzini@redhat.com> References: <1419250305-31062-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v6 11/11] 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, agraf@suse.de From: Laszlo Ersek 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 Signed-off-by: Paolo Bonzini --- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 8af4aa0..29fbdc1 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -633,6 +633,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); } -- 2.1.0