From nobody Tue Feb 10 21:20:00 2026 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622049870; cv=none; d=zohomail.com; s=zohoarc; b=go7vkzQRf3KragL0Df93CNHs0WZBZSU5fUF4ZYKObD7ZhZo2Z3uaZTsaoLxIrsjtD2fNohRPMImvwyhpHob5YqYBAn6fuLWl/DYCdVg5IQNVN6w/rEFmcsvfB8/zvOSSr6zzxE8To3gW7H+K3r7IEZcHyRPSAuI5BCNHQEA1Rek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622049870; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JLhAw7XD7qIOrjXaghuSYUyF7i2GShMvrYawRB6AMVs=; b=JKgRXmuiMJ7Ejclhoo+SlqDcOJvq58fbibIDgfofqvmM+4oazY0F3/L6JpDz5MfHomivwFOT1TrzU9527vAdjFq/QIDjN6yny1RS72V7Y0u1moAcU5M63adGhib7LdLxg5BytQCwF4gz3bbIRqHhcAJ1n4Tnl0Ck72YI0VMeo3I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622049870614561.9472715661856; Wed, 26 May 2021 10:24:30 -0700 (PDT) Received: from localhost ([::1]:58046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llxGd-0003zt-Pa for importer2@patchew.org; Wed, 26 May 2021 13:24:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llwyt-0007PS-BG for qemu-devel@nongnu.org; Wed, 26 May 2021 13:06:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52793) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llwya-0004R7-Id for qemu-devel@nongnu.org; Wed, 26 May 2021 13:06:01 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-337-vCWgMT3HMyiI8ynCWbNgwQ-1; Wed, 26 May 2021 13:05:42 -0400 Received: by mail-wr1-f70.google.com with SMTP id v5-20020adf9e450000b029010e708f05b3so614731wre.6 for ; Wed, 26 May 2021 10:05:41 -0700 (PDT) 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=1622048744; 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=SYdsxwqi4jQ+36gYJ81i+m5fCp6f69uPajuUiFsnGVcs0cHBqCmNWdnfGQvGQcZWXYxRIF 0igpIQoK39EK+F2+WesXEl5zpw8OlFQZtGTGGtRXVEQ99ofyp2fK/9l3HTkGbQZJrOqFEA XPNqc7JuxxOkDndjwfqVOA1cqXLe5cM= X-MC-Unique: vCWgMT3HMyiI8ynCWbNgwQ-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=SwjbTI9zjiR0mNxxkeo+nnWcnI8NU9SYMYEd6TtbeqHapP3QgLxFWci1V07QJt1qEk UJnTl+hwvD19sufWH1GRkWUpr4lLDckbUB+TqiSHjwILmopnpU/N/Vk5z0PY8tgPBINu GpeYLybvakdMIvYawbRVkuwa6X8/K5xQ2Y5gWywJnSK/dCwY4hflTSm5vYTFxF4owSIE mCP5+B9Be91uWARnzMSajJhusoPVI2cflfLJgDSwEGsRR1dRT+yD463D2oC2CLPvcMjg R/Qz3imqk3vPvFbvrAMAomYDfEo7g1rxKoI1e/O4oxCfeWfpFmqefyoc4x5kgCGdkI7a HUsA== X-Gm-Message-State: AOAM531jPTmiXwSBuveiS43u5fY13KrCLfK29S3eYlRxB2ae8b4s+KWK P3Y1Jab8qvhxsj4bi+oWbCg2yxdH9VBgFlxt7xb5Xdse2ryrVuUhCp0i/JpCu/+nPXWP7gAz8Mf FotR68ErX4BXgYibryz4KctZtrD26paGp6RLZ43dg5AjneBvARg698q6DeNysf84w X-Received: by 2002:a1c:5982:: with SMTP id n124mr29729663wmb.33.1622048740170; 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 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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Andrew Jones , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Thomas Huth , Paolo Bonzini Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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