From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Hogan Subject: [PATCH 4/4] mips_malta: Catch kernels linked at wrong address Date: Thu, 26 Jun 2014 10:44:25 +0100 Message-ID: <1403775865-25219-5-git-send-email-james.hogan@imgtec.com> References: <1403775865-25219-1-git-send-email-james.hogan@imgtec.com> Mime-Version: 1.0 Content-Type: text/plain Cc: , Aurelien Jarno , "Paolo Bonzini" , James Hogan To: Return-path: Received: from mailapp01.imgtec.com ([195.59.15.196]:45480 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751425AbaFZJor (ORCPT ); Thu, 26 Jun 2014 05:44:47 -0400 In-Reply-To: <1403775865-25219-1-git-send-email-james.hogan@imgtec.com> Sender: kvm-owner@vger.kernel.org List-ID: 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. Signed-off-by: James Hogan Cc: Aurelien Jarno Cc: 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 76cf5f2c48f4..95df42e6a4d5 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.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X06Ej-0002zG-GM for qemu-devel@nongnu.org; Thu, 26 Jun 2014 05:45:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X06EY-0008Ho-TU for qemu-devel@nongnu.org; Thu, 26 Jun 2014 05:44:57 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:26526) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X06EY-0008Hc-NY for qemu-devel@nongnu.org; Thu, 26 Jun 2014 05:44:46 -0400 From: James Hogan Date: Thu, 26 Jun 2014 10:44:25 +0100 Message-ID: <1403775865-25219-5-git-send-email-james.hogan@imgtec.com> In-Reply-To: <1403775865-25219-1-git-send-email-james.hogan@imgtec.com> References: <1403775865-25219-1-git-send-email-james.hogan@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 4/4] 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: Paolo Bonzini , James Hogan , Aurelien Jarno , kvm@vger.kernel.org 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. Signed-off-by: James Hogan Cc: Aurelien Jarno Cc: 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 76cf5f2c48f4..95df42e6a4d5 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.9.3