From nobody Mon Feb 9 09:34:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622048744; cv=none; d=zohomail.com; s=zohoarc; b=SPydNCWaopF5QdlA0xUH0W238FB0tlpzF0JqB6kotAepSU1/aVeYN+kaA2gBmZ1aWUqN0llqOJONWy15PlsFdNs/8pWLqB5fMCdhWUWwIhUWJP1hsXoh15ffRhp80s0MZdLxST3XGt/XKele0J4Y/SUBAlZ4JYxWz9XtjnBqxY0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622048744; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=JLhAw7XD7qIOrjXaghuSYUyF7i2GShMvrYawRB6AMVs=; b=fqhyYLFIzl2JR+jKMgBTS13DRMdh46LVJ/Ixl+BuivaDTqMJS7bis+hHW3tsQFGJn1lTGbWlS+xKFREv7qysg1PaGV4Yh1jWrCxh5jTHwKImOGzw1IX2RvXoCAUKBvZWnoAeGb2Iio5IyIkbCKR2GiR2E0iwovdHpA7YJSSpoiI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1622048744158234.93719973015288; Wed, 26 May 2021 10:05:44 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-448-XWLY1FFmMqegZiWS3fIp2Q-1; Wed, 26 May 2021 13:05:41 -0400 Received: by mail-wr1-f69.google.com with SMTP id 1-20020adf93810000b029010fd5ac4ed7so600978wrp.15 for ; Wed, 26 May 2021 10:05:41 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (64.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.64]) by smtp.gmail.com with ESMTPSA id z188sm15793094wme.38.2021.05.26.10.05.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 10:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622048742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JLhAw7XD7qIOrjXaghuSYUyF7i2GShMvrYawRB6AMVs=; b=RZGhal9ped4Q4SfznlOqTzaj4KEyFjhZHYjzNBLIZ/u2CS4ZftCj/NcUbth+jWlSQY6Rjx PowFH0uT5WVyjpZSdsIqgWCepY/dNEOqDwcuIOOf1vT7HKEgTNJXspGYhLlqajKfA1EfXV 7SgW+M07s302myhVCKS+RWPcajD5CYs= X-MC-Unique: XWLY1FFmMqegZiWS3fIp2Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JLhAw7XD7qIOrjXaghuSYUyF7i2GShMvrYawRB6AMVs=; b=Z53nO78uCog2L8rMeQYMHwoUKVJ3CbFzNp5kRxl8nsX7BZ0jmLh46LvoBMUP6+MrHx gTWd3HIRXpoaoqPgeDjTgwOuIlg2mQJZ+J0jaYvyhXKpkbfL8rUt9QmeKvAcgFc17vIV YvMqTpeXLctl2vNMsTd4i03Cme91o5TVroMb7IJjpc7XexO+n779OQjkkAjKJ9WNtmbA HI2LkXN7LgSWEi9EH9iKG9m64qTokxOs0uPDbDaaF2IecXem5HHG4F2PXXxMfx1vuang QKpe9Jis48M2nMufQSFv5s+3nzh/sFxe8ywDkwIsqqxJcmc3+RgzjxgKCCzeig/pCo/z Ga3A== X-Gm-Message-State: AOAM531tJ+NylldKpqUPxEB5ajRsURMjGQ6lD7UZekPspJXdYVm5dHAM zzNOmoTHAr0KSkQK/kOvfHQ8WRX/GNw0AsXW0jSBCOwmRhMiiqrMNJ5q4aPTwHJcSTmp7fM75H2 fDRKI1iiiMJB3HA== X-Received: by 2002:a1c:5982:: with SMTP id n124mr29729658wmb.33.1622048740138; Wed, 26 May 2021 10:05:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMGG7z8UKWqlemLMNjHEosnR/lNpsFsAree9mSOrsWiL6i4d+YXqf/OfxGgxIf7lTAZ5CFLg== X-Received: by 2002:a1c:5982:: with SMTP id n124mr29729628wmb.33.1622048739958; Wed, 26 May 2021 10:05:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Eric Blake , Markus Armbruster , Richard Henderson , Eduardo Habkost , Paolo Bonzini , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Jones , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Laurent Vivier Subject: [PATCH v8 07/12] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for TCG Date: Wed, 26 May 2021 19:04:27 +0200 Message-Id: <20210526170432.343588-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526170432.343588-1-philmd@redhat.com> References: <20210526170432.343588-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Now than we can probe if the TCG accelerator is available at runtime with a QMP command, only run these tests if TCG is built into the QEMU binary. Suggested-by: Andrew Jones Reviewed-by: Andrew Jones Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/arm-cpu-features.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index b1d406542f7..0d9145dd168 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 " #define QUERY_HEAD "{ 'execute': 'query-cpu-model-expansion', " \ " 'arguments': { 'type': 'full', " @@ -337,7 +337,7 @@ 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"); =20 assert_sve_vls(qts, "max", BIT_ULL(8) - 1, NULL); =20 @@ -372,7 +372,7 @@ 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"); =20 /* SVE is off, so the map should be empty. */ assert_sve_vls(qts, "max", 0, NULL); @@ -428,7 +428,7 @@ 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"); =20 /* Test common query-cpu-model-expansion input validation */ assert_type_full(qts); @@ -593,8 +593,10 @@ int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); =20 - qtest_add_data_func("/arm/query-cpu-model-expansion", - NULL, test_query_cpu_model_expansion); + if (qtest_has_accel("tcg")) { + qtest_add_data_func("/arm/query-cpu-model-expansion", + NULL, test_query_cpu_model_expansion); + } =20 /* * For now we only run KVM specific tests with AArch64 QEMU in @@ -608,7 +610,7 @@ int main(int argc, char **argv) NULL, sve_tests_sve_off_kvm); } =20 - if (g_str_equal(qtest_get_arch(), "aarch64")) { + if (g_str_equal(qtest_get_arch(), "aarch64") && qtest_has_accel("tcg")= ) { qtest_add_data_func("/arm/max/query-cpu-model-expansion/sve-max-vq= -8", NULL, sve_tests_sve_max_vq_8); qtest_add_data_func("/arm/max/query-cpu-model-expansion/sve-off", --=20 2.26.3