From nobody Wed Mar 12 17:30:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741091976434861.3007776105612; Tue, 4 Mar 2025 04:39:36 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 45D6613BE; Tue, 4 Mar 2025 07:39:35 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E4789140B; Tue, 4 Mar 2025 07:38:54 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 4593413D5; Tue, 4 Mar 2025 07:38:50 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4931C13C1 for ; Tue, 4 Mar 2025 07:38:43 -0500 (EST) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-592-lUEcVXgHN92A6wyNnds4hQ-1; Tue, 04 Mar 2025 07:38:41 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C5FBF19540F3 for ; Tue, 4 Mar 2025 12:38:40 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.15]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EE9FE19560AB for ; Tue, 4 Mar 2025 12:38:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741091923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kvw1326JWMY2GIomyGkpojIjw+rXRMR5s8ujxuswt4A=; b=cB3ps13rQcvsikV5MReNPDG1h5jAnjKZKJCv6Ba8PPmrTmgN4QDd6c3zgMa/OKgsFvS4S+ lFfMWnE7UBXI1xacrkiqECAey5WPYUGyz4tjDRIWFvc8IeHtkLu8FfoT1Gfg/1Xmx1PDL2 q6SjE3F+GaMaEMYCUkixi2qJbn7VqJg= X-MC-Unique: lUEcVXgHN92A6wyNnds4hQ-1 X-Mimecast-MFC-AGG-ID: lUEcVXgHN92A6wyNnds4hQ_1741091920 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 3/8] domaincapstest: Allow tests of all capability variants Date: Tue, 4 Mar 2025 13:38:28 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: TEpV5J94eqrPlbhUSRjgcT-1pVLSeHC-8RYcpfnTmJ4_1741091920 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 7VJL7SQVUNIWWAGHP26P5RX3HWWSPYNI X-Message-ID-Hash: 7VJL7SQVUNIWWAGHP26P5RX3HWWSPYNI X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741091979059019100 Content-Type: text/plain; charset="utf-8" Currently only the default variant ("") and "+hvf" are present in our test data but upcoming patches will add another variant. Upcoming test variants may not require any special handling so we should be able to handle them using the default code path now that 'variant' is properly propagated inside the test code. Remove the restriction to test only the default ("") and "+hvf" variant and modify the documentation to state that any other variant is tested the same way as the default one. Signed-off-by: Peter Krempa --- tests/domaincapstest.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 51fec0558f..96dc029af3 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -328,13 +328,11 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED, if (STREQ(variant, "+hvf")) hvf =3D true; - else if (STRNEQ(variant, "")) - return 0; if (STREQ(arch, "x86_64")) { /* For x86_64 based on the test variant we test: * - * '' (default) variant (KVM): + * '' (default) variant or any other non-listed variant: * - KVM with default machine * - KVM with Q35 machine * '+hvf' variant: @@ -362,7 +360,7 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED, } else if (STREQ(arch, "aarch64")) { /* For aarch64 based on the test variant we test: * - * '' (default) variant (KVM): + * '' (default) variant or any other non-listed variant: * - KVM with default machine * - KVM with virt machine * @@ -383,7 +381,8 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED, ret =3D -1; } } else if (STRPREFIX(arch, "riscv") || STRPREFIX(arch, "loongarch64"))= { - /* For riscv64 or loongarch64 we test two combinations: + /* For riscv64 or loongarch64 we test two combinations for any var= iant: + * ('+hvf' is not applicable for this case) * * - KVM with virt machine * - TCG with virt machine --=20 2.48.1