qemu-iotests: Use ppc64 qemu_arch on ppc64le host
The qemu target does not always correspond to the host machine type. For example ppc64le machine target is ppc64. Let's introduce "qemu_arch" variable to store the matching qemu architecture related to the current architecture and use it when auto-detecting the default qemu binary. Signed-off-by: Lukáš Doktor <ldoktor@redhat.com> Message-id: 20180329112053.5399-2-ldoktor@redhat.com Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
parent
733d1dce0f
commit
96914159b7
|
@ -538,8 +538,8 @@ if [ -z "$QEMU_PROG" ]
|
||||||
then
|
then
|
||||||
if [ -x "$build_iotests/qemu" ]; then
|
if [ -x "$build_iotests/qemu" ]; then
|
||||||
export QEMU_PROG="$build_iotests/qemu"
|
export QEMU_PROG="$build_iotests/qemu"
|
||||||
elif [ -x "$build_root/$arch-softmmu/qemu-system-$arch" ]; then
|
elif [ -x "$build_root/${qemu_arch}-softmmu/qemu-system-${qemu_arch}" ]; then
|
||||||
export QEMU_PROG="$build_root/$arch-softmmu/qemu-system-$arch"
|
export QEMU_PROG="$build_root/${qemu_arch}-softmmu/qemu-system-${qemu_arch}"
|
||||||
else
|
else
|
||||||
pushd "$build_root" > /dev/null
|
pushd "$build_root" > /dev/null
|
||||||
for binary in *-softmmu/qemu-system-*
|
for binary in *-softmmu/qemu-system-*
|
||||||
|
|
|
@ -23,6 +23,7 @@ PATH=".:$PATH"
|
||||||
|
|
||||||
HOSTOS=`uname -s`
|
HOSTOS=`uname -s`
|
||||||
arch=`uname -m`
|
arch=`uname -m`
|
||||||
|
[[ "$arch" =~ "ppc64" ]] && qemu_arch=ppc64 || qemu_arch="$arch"
|
||||||
|
|
||||||
export PWD=`pwd`
|
export PWD=`pwd`
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue