From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH] x86-run: Print a meaningful message if the qemu binary
 isn't found
Date: Thu, 02 Apr 2015 14:47:03 +0200
Message-ID: <551D3A47.1030404@redhat.com>
References: <jpg384j1rkm.fsf@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Cc: Marcelo Tosatti <mtosatti@redhat.com>
To: Bandan Das <bsd@redhat.com>, kvm@vger.kernel.org
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:33412 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750872AbbDBMrI (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 2 Apr 2015 08:47:08 -0400
Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
	by mx1.redhat.com (Postfix) with ESMTPS id EEDB4AECB8
	for <kvm@vger.kernel.org>; Thu,  2 Apr 2015 12:47:07 +0000 (UTC)
In-Reply-To: <jpg384j1rkm.fsf@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On 01/04/2015 23:12, Bandan Das wrote:
> 
> Before:
> ./x86-run ./x86/msr.flat
> QEMU binary has no support for test device. Exiting.
> 
> After:
> ./x86-run ./x86/msr.flat
> A QEMU binary was not found, You can set a custom
> location by using the QEMU=<path> environment variable
> 
> Signed-off-by: Bandan Das <bsd@redhat.com>
> ---
>  x86/run | 37 ++++++++++++++++++++++++++-----------
>  1 file changed, 26 insertions(+), 11 deletions(-)
> 
> diff --git a/x86/run b/x86/run
> index af37eb4..d5adf8d 100755
> --- a/x86/run
> +++ b/x86/run
> @@ -1,20 +1,35 @@
>  #!/bin/bash
> +NOTFOUND=1
> +TESTDEVNOTSUPP=2
>  
>  qemukvm="${QEMU:-qemu-kvm}"
>  qemusystem="${QEMU:-qemu-system-x86_64}"
> -if
> -	${qemukvm} -device '?' 2>&1 | grep -F -e \"testdev\" -e \"pc-testdev\" > /dev/null;
> +
> +if      ! [ -z "${QEMU}" ]
>  then
> -	qemu="${qemukvm}"
> +	qemu="${QEMU}"
>  else
> -	if
> -		${qemusystem} -device '?' 2>&1 | grep -F -e \"testdev\" -e \"pc-testdev\" > /dev/null;
> -	then
> -		qemu="${qemusystem}"
> -	else
> -		echo QEMU binary ${QEMU} has no support for test device. Exiting.
> -		exit 2
> -	fi
> +	for qemucmds in ${qemukvm} ${qemusystem}
> +	do
> +		unset QEMUFOUND
> +		unset qemu
> +		if ! [ -z "${QEMUFOUND=$(${qemucmds} --help 2>/dev/null | grep "QEMU")}" ] &&
> +		       ${qemucmds} -device '?' 2>&1 | grep -F -e \"testdev\" -e \"pc-testdev\" > /dev/null;
> +		then
> +		    qemu="${qemucmds}"
> +		    break
> +		fi
> +	done
> +fi
> +
> +if      [ -z "${QEMUFOUND}" ]
> +then
> +	echo "A QEMU binary was not found, You can set a custom location by using the QEMU=<path> environment variable "
> +	exit ${NOTFOUND}
> +elif    [ -z "${qemu}" ]
> +then
> +	echo "No Qemu test device support found"
> +	exit ${TESTDEVNOTSUPP}
>  fi
>  
>  if
> 

Thanks, applied.

Paolo