On 28/04/2015 21:59, Bandan Das wrote:
>
> This extends the sanity checks done on known common Qemu binary
> paths when the user supplies a QEMU= on the command line
>
> Fixes: b895b967db94937d5b593c51b95eb32d2889a764
>
> Signed-off-by: Bandan Das <bsd@xxxxxxxxxx>
> ---
> x86/run | 43 +++++++++++++++++++------------------------
> 1 file changed, 19 insertions(+), 24 deletions(-)
>
> diff --git a/x86/run b/x86/run
> index 219a93b..5281fca 100755
> --- a/x86/run
> +++ b/x86/run
> @@ -2,33 +2,28 @@
> NOTFOUND=1
> TESTDEVNOTSUPP=2
>
> -qemukvm="${QEMU:-qemu-kvm}"
> -qemusystem="${QEMU:-qemu-system-x86_64}"
> +qemubinarysearch="${QEMU:-qemu-kvm qemu-system-x86_64}"
>
> -if ! [ -z "${QEMU}" ]
> -then
> - qemu="${QEMU}"
> -else
> - 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
> - 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}" ]
> +for qemucmd in ${qemubinarysearch}
> +do
> + unset QEMUFOUND
> + unset qemu
> + if ! [ -z "${QEMUFOUND=$(${qemucmd} --help 2>/dev/null | grep "QEMU")}" ] &&
> + ${qemucmd} -device '?' 2>&1 | grep -F -e \"testdev\" -e \"pc-testdev\" > /dev/null;
> then
> - echo "No Qemu test device support found"
> - exit ${TESTDEVNOTSUPP}
> + 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=<path> environment variable "
> + exit ${NOTFOUND}
> +elif [ -z "${qemu}" ]
> +then
> + echo "No Qemu test device support found"
> + exit ${TESTDEVNOTSUPP}
> fi
>
> if
>
Applied now, thanks!
Paolo
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
