From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwxkD-0003Nr-Dx for qemu-devel@nongnu.org; Fri, 05 Dec 2014 13:36:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xwxk7-00031t-AA for qemu-devel@nongnu.org; Fri, 05 Dec 2014 13:36:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56361) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xwxk7-00031n-2h for qemu-devel@nongnu.org; Fri, 05 Dec 2014 13:36:39 -0500 From: Laszlo Ersek Date: Fri, 5 Dec 2014 19:36:15 +0100 Message-Id: <1417804575-19329-4-git-send-email-lersek@redhat.com> In-Reply-To: <1417804575-19329-1-git-send-email-lersek@redhat.com> References: <1417804575-19329-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] 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: rjones@redhat.com, crobinso@redhat.com, Peter Maydell , Drew Jones , Wei Huang , Ard Biesheuvel , qemu devel list , 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 --- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index af794ea..584c40d 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); } -- 1.8.3.1