From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxxfm-0000Ap-31 for qemu-devel@nongnu.org; Fri, 20 Jun 2014 08:12:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wxxfh-0002Iy-3d for qemu-devel@nongnu.org; Fri, 20 Jun 2014 08:12:02 -0400 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:55539) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxxfg-0002Ik-Su for qemu-devel@nongnu.org; Fri, 20 Jun 2014 08:11:57 -0400 Received: by mail-wi0-f176.google.com with SMTP id n3so684747wiv.9 for ; Fri, 20 Jun 2014 05:11:56 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 20 Jun 2014 14:11:23 +0200 Message-Id: <1403266283-1517-15-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403266283-1517-1-git-send-email-pbonzini@redhat.com> References: <1403266283-1517-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 14/14] hw/mips: malta: Don't boot from flash with KVM T&E List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: James Hogan From: James Hogan In KVM trap & emulate (T&E) mode the flash reset region at 0xbfc00000 isn't executable, which is why the minimal kernel bootloader is loaded and executed from the last 1MB of DRAM instead. Therefore if no kernel is provided on the command line and KVM is enabled, exit with an error since booting from flash will fail. Reported-by: Aurelien Jarno Signed-off-by: James Hogan Cc: Paolo Bonzini Signed-off-by: Paolo Bonzini --- hw/mips/mips_malta.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 8bc5392..91b0ce5 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1052,6 +1052,12 @@ void mips_malta_init(MachineState *machine) bootloader_run_addr, kernel_entry); } } else { + /* The flash region isn't executable from a KVM T&E guest */ + if (kvm_enabled()) { + error_report("KVM enabled but no -kernel argument was specified. " + "Booting from flash is not supported with KVM T&E."); + exit(1); + } /* Load firmware from flash. */ if (!dinfo) { /* Load a BIOS image. */ -- 1.7.1