From 4082ea0e37109d3a061832ae91050e5540806e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= Date: Wed, 29 Nov 2017 08:04:13 +0100 Subject: [PATCH] Disable cpu_model on s390x in valgrind_memalign MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "-cpu" can only be set in KVM mode on s390x, but this test runs in TCG. Let's disable it. Signed-off-by: Lukáš Doktor --- qemu/tests/cfg/valgrind_memalign.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qemu/tests/cfg/valgrind_memalign.cfg b/qemu/tests/cfg/valgrind_memalign.cfg index 1658d6e2..08726431 100644 --- a/qemu/tests/cfg/valgrind_memalign.cfg +++ b/qemu/tests/cfg/valgrind_memalign.cfg @@ -10,6 +10,8 @@ Ubuntu: valgrind_install_cmd = "apt-get install -y valgrind" s390x: + # -cpu can't be set in TCG + cpu_model = "" # s390 firmware quits when no-bootable devices (unlike x86) extra_params += " -no-shutdown" expected_status = "paused (shutdown)" -- GitLab