From af50bf7b783cee59cdf348e9263d5bb4a848148b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 4 Sep 2020 10:44:52 +0100 Subject: [PATCH] Check whether emulator works before doing sanity check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the emulator binary can't run, then the sanity check is never going to work either. Signed-off-by: Daniel P. Berrangé --- qemu.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/qemu.spec b/qemu.spec index 9530011..2aa30f8 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1408,16 +1408,16 @@ pushd build-dynamic make check V=1 %endif +# Check the binary runs (see eg RHBZ#998722). +b="./x86_64-softmmu/qemu-system-x86_64" +if [ -x "$b" ]; then "$b" -help; fi + %if %{qemu_sanity_check} # Sanity-check current kernel can boot on this qemu. # The results are advisory only. qemu-sanity-check --qemu=%{?hostqemu} ||: %endif -# Check the binary runs (see eg RHBZ#998722). -b="./x86_64-softmmu/qemu-system-x86_64" -if [ -x "$b" ]; then "$b" -help; fi - %endif popd @@ -1902,6 +1902,7 @@ getent passwd qemu >/dev/null || \ - Fix host qemu binary path for aarch64 - Re-enable kernel BR for QEMU sanity check - Fix conditionals for enabling QEMU sanity check +- Check whether emulator works before doing sanity check * Thu Sep 3 2020 Daniel P. Berrangé - 5.1.0-4 - Add btrfs ioctls to linux-user (rhbz #1872918)