From patchwork Fri Jan 9 07:33:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ehrhardt@linux.vnet.ibm.com X-Patchwork-Id: 1457 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n097Tpsi029256 for ; Thu, 8 Jan 2009 23:29:52 -0800 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751908AbZAIHdc (ORCPT ); Fri, 9 Jan 2009 02:33:32 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751964AbZAIHdc (ORCPT ); Fri, 9 Jan 2009 02:33:32 -0500 Received: from mtagate7.de.ibm.com ([195.212.29.156]:54426 "EHLO mtagate7.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751908AbZAIHdb (ORCPT ); Fri, 9 Jan 2009 02:33:31 -0500 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate7.de.ibm.com (8.13.8/8.13.8) with ESMTP id n097XTav382408 for ; Fri, 9 Jan 2009 07:33:29 GMT Received: from d12av04.megacenter.de.ibm.com (d12av04.megacenter.de.ibm.com [9.149.165.229]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id n097XTO64292690 for ; Fri, 9 Jan 2009 08:33:29 +0100 Received: from d12av04.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av04.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n097XTNi029816 for ; Fri, 9 Jan 2009 08:33:30 +0100 Received: from [9.152.212.28] (dyn-9-152-212-28.boeblingen.de.ibm.com [9.152.212.28]) by d12av04.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n097XM6L029727 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 9 Jan 2009 08:33:29 +0100 Message-ID: <4966FDC1.7070705@linux.vnet.ibm.com> Date: Fri, 09 Jan 2009 08:33:21 +0100 From: Christian Ehrhardt Organization: =?ISO-8859-1?Q?IBM_Deutschland_Research_=26_Develop?= =?ISO-8859-1?Q?ment_GmbH_/_Vorsitzender_des_Aufsichtsrats=3A_?= =?ISO-8859-1?Q?Martin_Jetter=3B_Gesch=E4ftsf=FChrung=3A_Erich_Ba?= =?ISO-8859-1?Q?ier=3B_Sitz_der_Gesellschaft=3A_B=F6blingen_/_?= =?ISO-8859-1?Q?Registergericht=3A_Amtsgericht_Stuttgart=2C_HRB_2?= =?ISO-8859-1?Q?43294_?= User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: Anthony Liguori CC: avi@qumranet.com, qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: Re: [PATCH] qemu: report issues causing the kvm probe to fail v3 References: <1231422848-32179-1-git-send-email-ehrhardt@linux.vnet.ibm.com> <4966635E.8090205@us.ibm.com> In-Reply-To: <4966635E.8090205@us.ibm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Anthony Liguori wrote: > ehrhardt@linux.vnet.ibm.com wrote: >> From: Christian Ehrhardt >> >> The patch applies to upstream qemu as well as kvm-userspace, but >> since it is >> the qemu configure script I think it should go to upstream qemu >> (Anthony) >> first and with the next merge to kvm-userspace. On the other hand it >> is the kvm >> probe so an ack from Avi in case v3 is ok would be reasonable. >> >> *updates* >> v2 - it also reports other errors than just #error preprocessor >> statements >> (requested by Avi) >> v3 - In case awk or grep is not installed it now gracfully (silently) >> fails still disabling kvm (requested by Anthony) >> >> This patch is about reporting more details of the issue if >> configuring kvm >> fails. Therefore this patch keeps the qemu style configure output >> which is a >> list of "$Feature $Status", but extend the "no" result like "KVM >> Support no" >> with some more information. >> >> There might be a lot of things going wrong with that probe and I >> don't want >> to handle all of them, but if it is one of the known checks e.g. for >> KVM_API_VERSION then we could grep/awk that out and report it. The patch >> reports in case of a known case in the style >> "KVM support no - (Missing KVM capability >> KVM_CAP_DESTROY_MEMORY_REGION_WORKS)" >> >> In case more than one #error is triggered it creates a comma >> separated list in >> those brackets and in case it is something else than an #error it >> just reports >> plain old "no". >> >> Signed-off-by: Christian Ehrhardt >> --- >> >> configure | 27 ++++++++++++++++++++------- >> 1 file changed, 20 insertions(+), 7 deletions(-) >> >> diff --git a/qemu/configure b/qemu/configure >> --- a/qemu/configure >> +++ b/qemu/configure >> > > Please send against upstream QEMU. > > Regards, > > Anthony Liguori > This applies to qemu upstream already when not specifying -p or -p 2 (as I already tested yesterday before submission). Well I removed the leading qemu dir manually and updated the -51 lines offset (attached), should I change more than that (add the leading trunk maybe, atm I'm just not sure what changes you want) ? Subject: [PATCH] qemu: report issues causing the kvm probe to fail v3 From: Christian Ehrhardt The patch applies to upstream qemu as well as kvm-userspace, but since it is the qemu configure script I think it should go to upstream qemu (Anthony) first and with the next merge to kvm-userspace. On the other hand it is the kvm probe so an ack from Avi in case v3 is ok would be reasonable. *updates* v2 - it also reports other errors than just #error preprocessor statements (requested by Avi) v3 - In case awk or grep is not installed it now gracfully (silently) fails still disabling kvm (requested by Anthony) This patch is about reporting more details of the issue if configuring kvm fails. Therefore this patch keeps the qemu style configure output which is a list of "$Feature $Status", but extend the "no" result like "KVM Support no" with some more information. There might be a lot of things going wrong with that probe and I don't want to handle all of them, but if it is one of the known checks e.g. for KVM_API_VERSION then we could grep/awk that out and report it. The patch reports in case of a known case in the style "KVM support no - (Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS)" In case more than one #error is triggered it creates a comma separated list in those brackets and in case it is something else than an #error it just reports plain old "no". Signed-off-by: Christian Ehrhardt --- configure | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/configure b/configure --- a/configure +++ b/configure @@ -951,13 +951,17 @@ if test "$kvm" = "yes" ; then if test "$kvm" = "yes" ; then cat > $TMPC < -#if !defined(KVM_API_VERSION) || \ - KVM_API_VERSION < 12 || \ - KVM_API_VERSION > 12 || \ - !defined(KVM_CAP_USER_MEMORY) || \ - !defined(KVM_CAP_SET_TSS_ADDR) || \ - !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS) +#if !defined(KVM_API_VERSION) || KVM_API_VERSION < 12 || KVM_API_VERSION > 12 #error Invalid KVM version +#endif +#if !defined(KVM_CAP_USER_MEMORY) +#error Missing KVM capability KVM_CAP_USER_MEMORY +#endif +#if !defined(KVM_CAP_SET_TSS_ADDR) +#error Missing KVM capability KVM_CAP_SET_TSS_ADDR +#endif +#if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS) +#error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS #endif int main(void) { return 0; } EOF @@ -970,7 +974,16 @@ EOF > /dev/null 2>/dev/null ; then : else - kvm="no" + kvm="no"; + if [ -x "`which awk 2>/dev/null`" ] && \ + [ -x "`which grep 2>/dev/null`" ]; then + kvmerr=`$cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $kvm_cflags $TMPC 2>&1 \ + | grep "error: " \ + | awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'` + if test "$kvmerr" != "" ; then + kvm="no - (${kvmerr})" + fi + fi fi fi