Commit 96914159 authored by Lukáš Doktor's avatar Lukáš Doktor Committed by Max Reitz
Browse files

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: default avatarLukáš Doktor <ldoktor@redhat.com>
Message-id: 20180329112053.5399-2-ldoktor@redhat.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 733d1dce

tests/qemu-iotests/check

+2 −2
Original line number Diff line number Diff line
@@ -538,8 +538,8 @@ if [ -z "$QEMU_PROG" ] 
then

    if [ -x "$build_iotests/qemu" ]; then

        export QEMU_PROG="$build_iotests/qemu"

    elif [ -x "$build_root/$arch-softmmu/qemu-system-$arch" ]; then

        export QEMU_PROG="$build_root/$arch-softmmu/qemu-system-$arch"

    elif [ -x "$build_root/${qemu_arch}-softmmu/qemu-system-${qemu_arch}" ]; then

        export QEMU_PROG="$build_root/${qemu_arch}-softmmu/qemu-system-${qemu_arch}"

    else

        pushd "$build_root" > /dev/null

        for binary in *-softmmu/qemu-system-*

tests/qemu-iotests/common.config

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ PATH=".:$PATH" 


HOSTOS=`uname -s`

arch=`uname -m`

[[ "$arch" =~ "ppc64" ]] && qemu_arch=ppc64 || qemu_arch="$arch"



export PWD=`pwd`