From nobody Tue Feb 10 06:07:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.53 as permitted sender) client-ip=209.85.208.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1612536280; cv=none; d=zohomail.com; s=zohoarc; b=Fv45w6xs2TzXgUvdjokO9TYQb19hZi8PjisOy/cc06L6J3FOH2fYGaIi/d346qy8s2j/Oou5HokiBzSTzQUpJoSxKnGW2IFjo/E+IZywmTORvRRmp7ym+JZdO32Iv3qdF8MfDHagewI8o5zGaNiov6/nf1HnKpLxhDvD+8oj21k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612536280; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gjWjrkoo9fwMU9Sch1mUKkw5VscVbA8NCnnTZX/2IUQ=; b=djtx3YVw89qvc8zvzL/ria5BSlfGQQzVlBvRa3jBgRoqlRgCT4lII0lF56bTfvAyhMZIuQj6IRbhBhmGgjC5FjypGIIgaa2we3w13P4R9i/tLRCyqULVW6fKmUtGHLS4m2xnHTXEQ0nWRH3dWoeNsN1icoKbKnxDAeWOkaklwss= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by mx.zohomail.com with SMTPS id 1612536280319103.41068397027516; Fri, 5 Feb 2021 06:44:40 -0800 (PST) Received: by mail-ed1-f53.google.com with SMTP id g10so9109867eds.2 for ; Fri, 05 Feb 2021 06:44:39 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id hr3sm3883275ejc.41.2021.02.05.06.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 06:44:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gjWjrkoo9fwMU9Sch1mUKkw5VscVbA8NCnnTZX/2IUQ=; b=YfbL3wd7WIFvDX66J6x/emlBwMT1vunccIADjGH5sA4zJ/cFFH+CrHhF7uOUJBg664 JZMOaMoGEKYIXEX6q6Dv3gnJCQwTdw98g/8Uh4Zf9GdgGTPkDZz0KPypUwra1LHb2608 nvejPdqhCSGmvdDxA2ZSwlOtqiuorJgOM1Ia2etQUCTLYQIU+vUKfGCTXAsTHKm80/62 X1mrFC7nqOdzl1YEpve4azx4vA/4JKMHno6PCGoUzxFl2KK8n7lJwAPqG3QNOmgm5fl6 2Hxls14icc2CsOCssTn0V1furNTPQIOa0nVvbO+prPo9EQudmofNp9WJXUAV246yKH9c iEEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gjWjrkoo9fwMU9Sch1mUKkw5VscVbA8NCnnTZX/2IUQ=; b=BLjo/4nJQ3zVctQ4s13oiozv4hLBljUzfvScP3kB7rCdWig4k2XdQDow26B/iZVytu HF2yTPFUvBSXrdNTQ8jkMwdFAx/zahvktwEUsGkFXljA91hndQTn/ow4yUWvAtxpB/1e HcROksHFU5DSXy3Qi3py1DVaQjQfjfHsTO6caxOqOnSBwidlT97lS6ES6VHs2qWh9P6C EWDzXsH3ZvSfQmNawyrUEtiW91P7NH4VhyAC7z23xQEynxavCqSIRUgGGZ0h70swYVyr MgjyfNxuPf3xOksavTSU8rG1EPVSXzpRvJ8jhDl6oc0X7RxuyTGNQ8Ezsqiyv9VSlHmY nXEQ== X-Gm-Message-State: AOAM531EXMc/lSIfNZA5fgnF31rMjiMT7T5SLVn+wpGHWQdt7bCfU7fw fPBoT39j+lwE5Dp/mEkGnOg= X-Google-Smtp-Source: ABdhPJxA0vKoza0E4rwkL255gG4NozbcAGeH9pTZfgqUu89/kfQHAHe/SMFvyoE4XELbfzLsNPM86A== X-Received: by 2002:a05:6402:524f:: with SMTP id t15mr3755462edd.158.1612536278411; Fri, 05 Feb 2021 06:44:38 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Andrew Jones , qemu-block@nongnu.org, Laurent Vivier , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , Claudio Fontana Subject: [RFC PATCH 9/9] tests/qtest/arm-cpu-features: Restrict TCG-only tests Date: Fri, 5 Feb 2021 15:43:45 +0100 Message-Id: <20210205144345.2068758-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205144345.2068758-1-f4bug@amsat.org> References: <20210205144345.2068758-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Some tests explicitly request the TCG accelerator. As these tests will obviously fails if TCG is not present, disable them in such case. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Roman Bolshakov Cc: Claudio Fontana RFC because of the TODO. Roman posted a series to have a QMP command to query enabled accelerators. --- tests/qtest/arm-cpu-features.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index c59c3cb002b..c6e86282b66 100644 --- a/tests/qtest/arm-cpu-features.c +++ b/tests/qtest/arm-cpu-features.c @@ -20,7 +20,7 @@ */ #define SVE_MAX_VQ 16 =20 -#define MACHINE "-machine virt,gic-version=3Dmax -accel tcg " +#define MACHINE_TCG "-machine virt,gic-version=3Dmax -accel tcg " #define MACHINE_KVM "-machine virt,gic-version=3Dmax -accel kvm -accel tcg= " #define QUERY_HEAD "{ 'execute': 'query-cpu-model-expansion', " \ " 'arguments': { 'type': 'full', " @@ -41,6 +41,16 @@ static bool kvm_enabled(QTestState *qts) return enabled; } =20 +static bool tcg_enabled(QTestState *qts) +{ + /* TODO: Implement QMP query-accel? */ +#ifdef CONFIG_TCG + return true; +#else + return false; +#endif /* CONFIG_TCG */ +} + static QDict *do_query_no_props(QTestState *qts, const char *cpu_type) { return qtest_qmp(qts, QUERY_HEAD "'model': { 'name': %s }" @@ -352,7 +362,12 @@ static void sve_tests_sve_max_vq_8(const void *data) { QTestState *qts; =20 - qts =3D qtest_init(MACHINE "-cpu max,sve-max-vq=3D8"); + qts =3D qtest_init(MACHINE_TCG "-cpu max,sve-max-vq=3D8"); + + if (!tcg_enabled(qts)) { + qtest_quit(qts); + return; + } =20 assert_sve_vls(qts, "max", BIT_ULL(8) - 1, NULL); =20 @@ -387,7 +402,12 @@ static void sve_tests_sve_off(const void *data) { QTestState *qts; =20 - qts =3D qtest_init(MACHINE "-cpu max,sve=3Doff"); + qts =3D qtest_init(MACHINE_TCG "-cpu max,sve=3Doff"); + + if (!tcg_enabled(qts)) { + qtest_quit(qts); + return; + } =20 /* SVE is off, so the map should be empty. */ assert_sve_vls(qts, "max", 0, NULL); @@ -443,7 +463,12 @@ static void test_query_cpu_model_expansion(const void = *data) { QTestState *qts; =20 - qts =3D qtest_init(MACHINE "-cpu max"); + qts =3D qtest_init(MACHINE_TCG "-cpu max"); + + if (!tcg_enabled(qts)) { + qtest_quit(qts); + return; + } =20 /* Test common query-cpu-model-expansion input validation */ assert_type_full(qts); --=20 2.26.2