Commit d9a05378 authored by Bandan Das's avatar Bandan Das Committed by Paolo Bonzini
Browse files

x86/run: Rearrange the valid binary and testdev support checks

This extends the sanity checks done on known common Qemu binary
paths when the user supplies a QEMU= on the command line

Fixes: b895b967

Signed-off-by: default avatarBandan Das <bsd@redhat.com>
Message-Id: <jpg383krpli.fsf@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2e5b8f11
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment