From mboxrd@z Thu Jan 1 00:00:00 1970 From: Balamuruhan S Subject: Re: [kvm-unit-tests PATCH 1/4] scripts/arch-run: function to search qemu binary Date: Fri, 21 Apr 2017 18:20:41 +0530 Message-ID: <20170421125041.GA31352@dhcp-9-199-64-251.in.ibm.com> References: <1492629251-23267-1-git-send-email-bala24@linux.vnet.ibm.com> <23638b58-5c0c-6f7c-1ffe-c8a918f6a14b@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kvm@vger.kernel.org To: Paolo Bonzini Return-path: Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:60486 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1038589AbdDUMvk (ORCPT ); Fri, 21 Apr 2017 08:51:40 -0400 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v3LCmpFO065172 for ; Fri, 21 Apr 2017 08:51:39 -0400 Received: from e23smtp08.au.ibm.com (e23smtp08.au.ibm.com [202.81.31.141]) by mx0b-001b2d01.pphosted.com with ESMTP id 29ygefe72m-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 21 Apr 2017 08:51:38 -0400 Received: from localhost by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 21 Apr 2017 22:51:34 +1000 Received: from d23av05.au.ibm.com (d23av05.au.ibm.com [9.190.234.119]) by d23relay10.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v3LCpO3d47972516 for ; Fri, 21 Apr 2017 22:51:32 +1000 Received: from d23av05.au.ibm.com (localhost [127.0.0.1]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v3LCp0Bb000972 for ; Fri, 21 Apr 2017 22:51:00 +1000 Content-Disposition: inline In-Reply-To: <23638b58-5c0c-6f7c-1ffe-c8a918f6a14b@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Thank you Paolo. Regards, Bala On Fri, Apr 21, 2017 at 01:07:25PM +0200, Paolo Bonzini wrote: > Series applied with some cleanups: > > diff --git a/arm/run b/arm/run > index 696228e..bae43fd 100755 > --- a/arm/run > +++ b/arm/run > @@ -31,13 +31,10 @@ if [ -z "$ACCEL" ]; then > fi > fi > > -# qemu_binary () defined in scripts/arch-run.bash > -qemu_binary > - > -qpath=$(which $qemu 2>/dev/null) > +qemu=$(search_qemu_binary) > > if ! $qemu -machine '?' 2>&1 | grep 'ARM Virtual Machine' > /dev/null; then > - echo "$qpath doesn't support mach-virt ('-machine virt'). Exiting." > + echo "$qemu doesn't support mach-virt ('-machine virt'). Exiting." > exit 2 > fi > > @@ -56,13 +53,13 @@ if [ "$ACCEL" = "kvm" ]; then > fi > > if ! $qemu $M -device '?' 2>&1 | grep virtconsole > /dev/null; then > - echo "$qpath doesn't support virtio-console for chr-testdev. Exiting." > + echo "$qemu doesn't support virtio-console for chr-testdev. Exiting." > exit 2 > fi > > if $qemu $M -chardev testdev,id=id -initrd . 2>&1 \ > | grep backend > /dev/null; then > - echo "$qpath doesn't support chr-testdev. Exiting." > + echo "$qemu doesn't support chr-testdev. Exiting." > exit 2 > fi > > diff --git a/powerpc/run b/powerpc/run > index 4302fe2..69d2b53 100755 > --- a/powerpc/run > +++ b/powerpc/run > @@ -28,13 +28,10 @@ if [ -z "$ACCEL" ]; then > fi > fi > > -# qemu_binary () defined in scripts/arch-run.bash > -qemu_binary > - > -qpath=$(which $qemu 2>/dev/null) > +qemu=$(search_qemu_binary) > > if ! $qemu -machine '?' 2>&1 | grep 'pseries' > /dev/null; then > - echo "$qpath doesn't support pSeries ('-machine pseries'). Exiting." > + echo "$qemu doesn't support pSeries ('-machine pseries'). Exiting." > exit 2 > fi > > diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash > index 404a4c0..fb5fd7d 100644 > --- a/scripts/arch-run.bash > +++ b/scripts/arch-run.bash > @@ -135,11 +135,12 @@ migration_cmd () > } > > # qemu binary search function for all arches > -qemu_binary () > +search_qemu_binary () > { > - qemubinarysearch="${QEMU:-qemu-system-$ARCH_NAME qemu-kvm}" > - for qemucmd in ${qemubinarysearch} > + PATH=$PATH:/usr/libexec > + local save_path=$PATH > + local qemucmd QEMUFOUND qemu > + export PATH=$PATH:/usr/libexec > + for qemucmd in ${QEMU:-qemu-system-$ARCH_NAME qemu-kvm} > do > unset QEMUFOUND > unset qemu > @@ -154,4 +155,6 @@ qemu_binary () > echo "A QEMU binary was not found, You can set a custom location by using the QEMU= environment variable" > exit 2 > fi > + which $qemu > + export PATH=$save_path > } > diff --git a/x86/run b/x86/run > index eebfef9..b4db2a9 100755 > --- a/x86/run > +++ b/x86/run > @@ -2,8 +2,7 @@ > > [ -z "$STANDALONE" ] && source scripts/arch-run.bash > > -# qemu_binary () defined in scripts/arch-run.bash > -qemu_binary > +qemu=$(search_qemu_binary) > > if ! ${qemu} -device '?' 2>&1 | grep -F -e \"testdev\" -e \"pc-testdev\" > /dev/null; > then > > > On 19/04/2017 21:14, Balamuruhan S wrote: > > qemu_binary function to seach qemu binary similar to x86/run does > > so that it can be reused for all arches > > > > Signed-off-by: Balamuruhan S > > --- > > scripts/arch-run.bash | 22 ++++++++++++++++++++++ > > 1 file changed, 22 insertions(+) > > > > diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash > > index 94c50f3..404a4c0 100644 > > --- a/scripts/arch-run.bash > > +++ b/scripts/arch-run.bash > > @@ -133,3 +133,25 @@ migration_cmd () > > echo "run_migration" > > fi > > } > > + > > +# qemu binary search function for all arches > > +qemu_binary () > > +{ > > + PATH=$PATH:/usr/libexec > > + qemubinarysearch="${QEMU:-qemu-system-$ARCH_NAME qemu-kvm}" > > + for qemucmd in ${qemubinarysearch} > > + do > > + unset QEMUFOUND > > + unset qemu > > + if ! [ -z "${QEMUFOUND=$(${qemucmd} --help 2>/dev/null | grep "QEMU")}" ] > > + then > > + qemu="${qemucmd}" > > + break > > + fi > > + done > > + > > + if [ -z "${QEMUFOUND}" ]; then > > + echo "A QEMU binary was not found, You can set a custom location by using the QEMU= environment variable" > > + exit 2 > > + fi > > +} > > >