From nobody Fri Dec 19 19:11:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@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.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1679064956; cv=none; d=zohomail.com; s=zohoarc; b=UQKWboTuSPRVQRp4h9b8qooQB7SMbiOzHJc8EieHWk1sUDPCPXxuIGxtb0SA2glOepIpGHw43PB1U06OKwnDBXM5ImK58SJJGkPvCa1z4SczvVZWXvsKRCqh8gOjfwM5SXFyRlNd+/Wm1MtaSq+XlpAyfZPIE+KEDtvE4yROveo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679064956; h=Content-Type:Content-Transfer-Encoding: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=wmrJcdR1qY8peejt88Qn3DPXNCyIwYnnR64aeZUMA7E=; b=dpQRFjeJwtY2Rkm7hlwQQ4P36amTWAbDQryuz1THLg/bPPgrnwHbebVV84tzr3yk61hdX4U/HlAOAJZz8zinmYAXtUPVaWg0EaLJ3cgstr1pYE5IVZSA9kYU9dXW/ZQwcjLjQuyCtAFU/KS3YroU72JKZQiZuOLGaClYYFv4dp0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1679064956128244.5978586275221; Fri, 17 Mar 2023 07:55:56 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-219-TMXBflNjNmygXhE1cjQbbA-1; Fri, 17 Mar 2023 10:55:51 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9BF0E3815F9C; Fri, 17 Mar 2023 14:55:47 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 678D9112131E; Fri, 17 Mar 2023 14:55:47 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DF8321946A68; Fri, 17 Mar 2023 14:55:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 251191946587 for ; Thu, 16 Mar 2023 16:12:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 088812166B26; Thu, 16 Mar 2023 16:12:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34A582166B29 for ; Thu, 16 Mar 2023 16:12:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679064955; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=wmrJcdR1qY8peejt88Qn3DPXNCyIwYnnR64aeZUMA7E=; b=PKsbzaoO8uVbsWXETYCCYlgMSmpt+ZmZ/OxcQPwLmK+asxQlyJEAXZ1iVMWh8uE0cKEGIp mYngqVKheeZuFF3ARvlMvr1JKlfKmz5R8HoOcbEMLB1eSevXbuHdXaXZnXWORJUlFqGqJI jY9R66KLbEXx48OQ1YYI71wlgw3x6tY= X-MC-Unique: TMXBflNjNmygXhE1cjQbbA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/24] domaincapstest: Propagate variant name into doTestQemuInternal Date: Thu, 16 Mar 2023 17:11:39 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1679064957989100001 Content-Type: text/plain; charset="utf-8" Use it to format test file name as in other cases. Currently domaincapstest will not run for any unknown variant. This patch is meant to simplify the review of patches doing actual functional changes. Signed-off-by: Peter Krempa --- tests/domaincapstest.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 20163e0a72..a34eb82015 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -246,6 +246,7 @@ static int doTestQemuInternal(const char *version, const char *machine, const char *arch, + const char *variant, virDomainVirtType type, void *opaque) { @@ -284,8 +285,8 @@ doTestQemuInternal(const char *version, else mach =3D g_strdup(""); - data.name =3D name =3D g_strdup_printf("qemu_%s%s%s.%s", - version, typestr, mach, arch); + data.name =3D name =3D g_strdup_printf("qemu_%s%s%s.%s%s", + version, typestr, mach, arch, varia= nt); if (STRPREFIX(version, "3.") || STRPREFIX(version, "4.") || @@ -329,15 +330,15 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED, * - KVM with Q35 machine * - TCG with default machine */ - if (doTestQemuInternal(version, NULL, arch, + if (doTestQemuInternal(version, NULL, arch, variant, VIR_DOMAIN_VIRT_KVM, opaque) < 0) ret =3D -1; - if (doTestQemuInternal(version, "q35", arch, + if (doTestQemuInternal(version, "q35", arch, variant, VIR_DOMAIN_VIRT_KVM, opaque) < 0) ret =3D -1; - if (doTestQemuInternal(version, NULL, arch, + if (doTestQemuInternal(version, NULL, arch, variant, VIR_DOMAIN_VIRT_QEMU, opaque) < 0) ret =3D -1; } else if (STREQ(arch, "aarch64")) { @@ -346,11 +347,11 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED, * - KVM with default machine * - KVM with virt machine */ - if (doTestQemuInternal(version, NULL, arch, + if (doTestQemuInternal(version, NULL, arch, variant, VIR_DOMAIN_VIRT_KVM, opaque) < 0) ret =3D -1; - if (doTestQemuInternal(version, "virt", arch, + if (doTestQemuInternal(version, "virt", arch, variant, VIR_DOMAIN_VIRT_KVM, opaque) < 0) ret =3D -1; } else if (STRPREFIX(arch, "riscv")) { @@ -359,15 +360,15 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED, * - KVM with virt machine * - TCG with virt machine */ - if (doTestQemuInternal(version, "virt", arch, + if (doTestQemuInternal(version, "virt", arch, variant, VIR_DOMAIN_VIRT_KVM, opaque) < 0) ret =3D -1; - if (doTestQemuInternal(version, "virt", arch, + if (doTestQemuInternal(version, "virt", arch, variant, VIR_DOMAIN_VIRT_QEMU, opaque) < 0) ret =3D -1; } else { - if (doTestQemuInternal(version, NULL, arch, + if (doTestQemuInternal(version, NULL, arch, variant, VIR_DOMAIN_VIRT_KVM, opaque) < 0) ret =3D -1; } --=20 2.39.2