From mboxrd@z Thu Jan 1 00:00:00 1970 From: Aurelien Jarno Subject: Re: [PATCH 4/4] mips_malta: Catch kernels linked at wrong address Date: Fri, 27 Jun 2014 10:43:56 +0200 Message-ID: <20140627084355.GD10041@hall.aurel32.net> References: <1403775865-25219-1-git-send-email-james.hogan@imgtec.com> <1403775865-25219-5-git-send-email-james.hogan@imgtec.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Paolo Bonzini To: James Hogan Return-path: Received: from hall.aurel32.net ([195.154.112.97]:50886 "EHLO hall.aurel32.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752462AbaF0In5 (ORCPT ); Fri, 27 Jun 2014 04:43:57 -0400 Content-Disposition: inline In-Reply-To: <1403775865-25219-5-git-send-email-james.hogan@imgtec.com> Sender: kvm-owner@vger.kernel.org List-ID: On Thu, Jun 26, 2014 at 10:44:25AM +0100, James Hogan wrote: > 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; > } Reviewed-by: Aurelien Jarno -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurelien@aurel32.net http://www.aurel32.net From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0RlF-0006hI-UV for qemu-devel@nongnu.org; Fri, 27 Jun 2014 04:43:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0RlE-0005Cs-Ui for qemu-devel@nongnu.org; Fri, 27 Jun 2014 04:43:57 -0400 Received: from hall.aurel32.net ([2001:bc8:30d7:101::1]:53704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0RlE-0005Co-OB for qemu-devel@nongnu.org; Fri, 27 Jun 2014 04:43:56 -0400 Date: Fri, 27 Jun 2014 10:43:56 +0200 From: Aurelien Jarno Message-ID: <20140627084355.GD10041@hall.aurel32.net> References: <1403775865-25219-1-git-send-email-james.hogan@imgtec.com> <1403775865-25219-5-git-send-email-james.hogan@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <1403775865-25219-5-git-send-email-james.hogan@imgtec.com> Sender: Aurelien Jarno Subject: Re: [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: James Hogan Cc: Paolo Bonzini , qemu-devel@nongnu.org, kvm@vger.kernel.org On Thu, Jun 26, 2014 at 10:44:25AM +0100, James Hogan wrote: > 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; > } Reviewed-by: Aurelien Jarno -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurelien@aurel32.net http://www.aurel32.net