From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3Puz-0003j9-OV for qemu-devel@nongnu.org; Tue, 23 Dec 2014 08:54:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y3Puy-000143-8E for qemu-devel@nongnu.org; Tue, 23 Dec 2014 08:54:33 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:54613) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3Puy-00013H-1Z for qemu-devel@nongnu.org; Tue, 23 Dec 2014 08:54:32 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Y3Puv-00044u-1W for qemu-devel@nongnu.org; Tue, 23 Dec 2014 13:54:29 +0000 From: Peter Maydell Date: Tue, 23 Dec 2014 13:54:27 +0000 Message-Id: <1419342867-15527-32-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1419342867-15527-1-git-send-email-peter.maydell@linaro.org> References: <1419342867-15527-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 31/31] 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: qemu-devel@nongnu.org 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 Message-id: 1419250305-31062-12-git-send-email-pbonzini@redhat.com Signed-off-by: Peter Maydell --- 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