From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4uHm-0005oF-NW for qemu-devel@nongnu.org; Wed, 09 Jul 2014 12:00:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4uHh-0006nL-JK for qemu-devel@nongnu.org; Wed, 09 Jul 2014 11:59:58 -0400 Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]:57522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4uHh-0006n3-Bb for qemu-devel@nongnu.org; Wed, 09 Jul 2014 11:59:53 -0400 Received: by mail-wi0-f180.google.com with SMTP id hi2so3032171wib.7 for ; Wed, 09 Jul 2014 08:59:52 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 9 Jul 2014 17:59:31 +0200 Message-Id: <1404921577-1461-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1404921577-1461-1-git-send-email-pbonzini@redhat.com> References: <1404921577-1461-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 04/10] mips_malta: Catch kernels linked at wrong address List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: James Hogan , Aurelien Jarno From: James Hogan Add error reporting if the wrong type of kernel is provided for the current mode of acceleration. Currently a KVM kernel linked at 0x40000000 can't be used with TCG, and a normal kernel linked at 0x80000000 can't be used with KVM. Cc: Aurelien Jarno Cc: Paolo Bonzini Signed-off-by: James Hogan Reviewed-by: Aurelien Jarno Signed-off-by: Paolo Bonzini --- hw/mips/mips_malta.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 76cf5f2..95df42e 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -792,9 +792,23 @@ static int64_t load_kernel (void) loaderparams.kernel_filename); exit(1); } + + /* Sanity check where the kernel has been linked */ if (kvm_enabled()) { + if (kernel_entry & 0x80000000ll) { + error_report("KVM guest kernels must be linked in useg. " + "Did you forget to enable CONFIG_KVM_GUEST?"); + exit(1); + } + xlate_to_kseg0 = cpu_mips_kvm_um_phys_to_kseg0; } else { + if (!(kernel_entry & 0x80000000ll)) { + error_report("KVM guest kernels aren't supported with TCG. " + "Did you unintentionally enable CONFIG_KVM_GUEST?"); + exit(1); + } + xlate_to_kseg0 = cpu_mips_phys_to_kseg0; } -- 1.8.3.1