[PATCH] x86-run: Print a meaningful message if the qemu binary isn't found

[PATCH] x86-run: Print a meaningful message if the qemu binary isn't found

[Bandan Das]

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
-- 
2.1.0

Re: [PATCH] x86-run: Print a meaningful message if the qemu binary isn't found

[Paolo Bonzini]

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

Re: [PATCH] x86-run: Print a meaningful message if the qemu binary isn't found

[Paolo Bonzini]

On 02/04/2015 14:47, Paolo Bonzini wrote:
> 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>

This breaks "QEMU=... ./x86-run ./x86/msr.flat"

Fixed as follows:

diff --git a/x86/run b/x86/run
index d5adf8d..219a93b 100755
--- a/x86/run
+++ b/x86/run
@@ -20,16 +20,15 @@ else
 		    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}
+	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
 fi
 
 if

which apart from reindentation is just moving a "fi" down.
Paolo

Re: [PATCH] x86-run: Print a meaningful message if the qemu binary isn't found

[Bandan Das]

Paolo Bonzini <pbonzini@redhat.com> writes:
...
> This breaks "QEMU=... ./x86-run ./x86/msr.flat"
>
> Fixed as follows:
>
> diff --git a/x86/run b/x86/run
> index d5adf8d..219a93b 100755
> --- a/x86/run
> +++ b/x86/run
> @@ -20,16 +20,15 @@ else
>  		    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}
> +	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"

I think we still want to print this if the user supplied qemu has no test
device support. I think this is better -
--- a/x86/run
+++ b/x86/run
@@ -8,6 +8,7 @@ qemusystem="${QEMU:-qemu-system-x86_64}"
 if      ! [ -z "${QEMU}" ]
 then
        qemu="${QEMU}"
+       QEMUFOUND=1
 else
        for qemucmds in ${qemukvm} ${qemusystem}
        do

> +		exit ${TESTDEVNOTSUPP}
> +	fi
>  fi
>  
>  if
>
> which apart from reindentation is just moving a "fi" down.
> Paolo

Re: [PATCH] x86-run: Print a meaningful message if the qemu binary isn't found

[Paolo Bonzini]

On 09/04/2015 19:14, Bandan Das wrote:
> Paolo Bonzini <pbonzini@redhat.com> writes:
> ...
>> This breaks "QEMU=... ./x86-run ./x86/msr.flat"
>>
>> Fixed as follows:
>>
>> diff --git a/x86/run b/x86/run
>> index d5adf8d..219a93b 100755
>> --- a/x86/run
>> +++ b/x86/run
>> @@ -20,16 +20,15 @@ else
>>  		    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}
>> +	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"
> 
> I think we still want to print this if the user supplied qemu has no test
> device support.

Yes, but we do not go through the "for" in that case...

Can you make a patch on top of master?

Paolo

Re: [PATCH] x86-run: Print a meaningful message if the qemu binary isn't found

[Bandan Das]

Bandan Das <bsd@redhat.com> writes:
...
>
> I think we still want to print this if the user supplied qemu has no test
> device support. I think this is better -
> --- a/x86/run
> +++ b/x86/run
> @@ -8,6 +8,7 @@ qemusystem="${QEMU:-qemu-system-x86_64}"
>  if      ! [ -z "${QEMU}" ]
>  then
>         qemu="${QEMU}"
> +       QEMUFOUND=1
>  else

Damn, please ignore the previous message. This does nothing and I
need more sleep.

Bandan

>         for qemucmds in ${qemukvm} ${qemusystem}
>         do
>
>> +		exit ${TESTDEVNOTSUPP}
>> +	fi
>>  fi
>>  
>>  if
>>
>> which apart from reindentation is just moving a "fi" down.
>> Paolo