[Qemu-devel] [PATCH] qemu-iotests: look for qemu-iotests-$ARCH

[Christoph Hellwig]

Look for the binary as installed by qemu make install instead of
requiring the qemu symlink.  Note that we need a couple of regular
expressions to munge the uname output into the architecture name
qemu expects.


Signed-off-by: Christoph Hellwig <address@hidden>

diff --git a/common.config b/common.config
index a594632..0a8d5b4 100644
--- a/common.config
+++ b/common.config
@@ -39,6 +39,16 @@ PATH=".:$PATH"
 
 HOST=`hostname -s`
 HOSTOS=`uname -s`
+ARCH=`uname -m | \
+       sed -e s/i.86/x86_64/ \
+           -e s/sun4u/sparc/ \
+           -e s/arm.*/arm/ \
+           -e s/sa110/arm/ \
+           -e s/s390x/s390/ \
+           -e s/parisc.*/hppa/ \
+           -e s/ppc.*/powerpc/ \
+           -e s/mips.*/mips/ \
+           -e s/sh[234].*/sh/`
 
 address@hidden    # where auto-qa will send its status messages
 export HOST_OPTIONS=${HOST_OPTIONS:=local.config}
@@ -88,7 +98,7 @@ export BC_PROG="`set_prog_path bc`"
 
 export PS_ALL_FLAGS="-ef"
 
-export QEMU_PROG="`set_prog_path qemu`"
+export QEMU_PROG="`set_prog_path qemu-system-$ARCH`"
 [ "$QEMU_PROG" = "" ] && _fatal "qemu not found"
 
 export QEMU_IMG_PROG="`set_prog_path qemu-img`"