From nobody Wed Oct 22 12:27:10 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1759930143; cv=none; d=zohomail.com; s=zohoarc; b=Zu7Agv3oLWNPKMzKySE5S+WqKsKHp4IBFFbpHdTt3DqZJ9pRjdCPg8Rwrfm8Jcjkgzx060eJL58kol0gUdqnzyNYd3bC63P/jIU/MxLPZ2+aQAuUh8BjPMWqYtnq4pN9alk7egMeBfZH+lzkamLTbP2iHv2F2X5XLXKA2Y16rRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759930143; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=eBo8wz5x98zD8M2Tl0GWft8AdmkB5e9RfiLLippOBtU=; b=aty9LjaXfggY/47DM87G98NXSCbLfCRbb0dZdTOGbYoc7iMshdcj2PmrdzM4Vj916enk1Ws8/JRfPRoEKirH2S5DvVKLejPczy8aWMxyrU7thVvPCOxE8oyCYpdMnLf69GUNZT2qIwE6WNQcMQzDSegOYRYl5FEsaz/r5WdGub8= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1759930143606833.8165210614646; Wed, 8 Oct 2025 06:29:03 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id C5EF844399; Wed, 8 Oct 2025 09:29:02 -0400 (EDT) Received: from [172.19.199.17] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 7113A41814; Wed, 8 Oct 2025 09:18:13 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 4F74644144; Wed, 8 Oct 2025 08:55:44 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6942B44215 for ; Wed, 8 Oct 2025 08:54:25 -0400 (EDT) Received: from mx-prod-mc-03.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-205-D4XOEYbkOZ-xLyDIHuJWVg-1; Wed, 08 Oct 2025 08:54:24 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 45FDD195605B for ; Wed, 8 Oct 2025 12:54:23 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.3.236]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 924A419560A2 for ; Wed, 8 Oct 2025 12:54:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1759928065; 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=eBo8wz5x98zD8M2Tl0GWft8AdmkB5e9RfiLLippOBtU=; b=LTDlywmvZMDYjEe017OcwhI4/eRGp6wa+MGr4SLgFvWrvS2NxOQ7UPYDUIhFyDKY5J3YZw BAkeI8ucf7GFmzNieigmqtIlZLEhZcVSCArjSCaQjmj+QGKi5RusBQHwWph23owJdXAFP4 nBUIkdWTo846XKBUBr4e04YokSXt4wI= X-MC-Unique: D4XOEYbkOZ-xLyDIHuJWVg-1 X-Mimecast-MFC-AGG-ID: D4XOEYbkOZ-xLyDIHuJWVg_1759928063 To: devel@lists.libvirt.org Subject: [PATCH v2 15/29] domain_conf: Move format of hyperv features into a function Date: Wed, 8 Oct 2025 14:53:47 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: BIqinO5D-Oh2Jk_kPVwk8ecLtyxChpImWuQx6h9Fc58_1759928063 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RUSMXWY64A3IDNGX6ZZOT35R7QVAN2NU X-Message-ID-Hash: RUSMXWY64A3IDNGX6ZZOT35R7QVAN2NU X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1759930146156154100 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Signed-off-by: Michal Privoznik --- src/conf/domain_conf.c | 158 ++++++++++++++++++++++------------------- 1 file changed, 84 insertions(+), 74 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 156e43f5cd..585546d6fd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28581,6 +28581,89 @@ virDomainFeatureTCGFormat(virBuffer *buf, } =20 =20 +static void +virDomainFeaturesHyperVDefFormat(virBuffer *buf, + const virDomainDef *def) +{ + virBuffer tmpChildBuf =3D VIR_BUFFER_INIT_CHILD(buf); + size_t j; + + if (def->features[VIR_DOMAIN_FEATURE_HYPERV] =3D=3D VIR_DOMAIN_HYPERV_= MODE_NONE) + return; + + virBufferAsprintf(buf, "\n", + virDomainHyperVModeTypeToString(def->features[VIR_DO= MAIN_FEATURE_HYPERV])); + + for (j =3D 0; j < VIR_DOMAIN_HYPERV_LAST; j++) { + g_auto(virBuffer) hypervAttrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) hypervChildBuf =3D VIR_BUFFER_INIT_CHILD(&tmpChi= ldBuf); + + if (def->hyperv_features[j] =3D=3D VIR_TRISTATE_SWITCH_ABSENT) + continue; + + virBufferAsprintf(&hypervAttrBuf, " state=3D'%s'", + virTristateSwitchTypeToString(def->hyperv_featur= es[j])); + + switch ((virDomainHyperv) j) { + case VIR_DOMAIN_HYPERV_RELAXED: + case VIR_DOMAIN_HYPERV_VAPIC: + case VIR_DOMAIN_HYPERV_VPINDEX: + case VIR_DOMAIN_HYPERV_RUNTIME: + case VIR_DOMAIN_HYPERV_SYNIC: + case VIR_DOMAIN_HYPERV_RESET: + case VIR_DOMAIN_HYPERV_FREQUENCIES: + case VIR_DOMAIN_HYPERV_REENLIGHTENMENT: + case VIR_DOMAIN_HYPERV_IPI: + case VIR_DOMAIN_HYPERV_EVMCS: + case VIR_DOMAIN_HYPERV_AVIC: + case VIR_DOMAIN_HYPERV_EMSR_BITMAP: + case VIR_DOMAIN_HYPERV_XMM_INPUT: + break; + + case VIR_DOMAIN_HYPERV_SPINLOCKS: + if (def->hyperv_features[j] =3D=3D VIR_TRISTATE_SWITCH_ON) { + virBufferAsprintf(&hypervAttrBuf, + " retries=3D'%d'", def->hyperv_spinlocks= ); + } + break; + + case VIR_DOMAIN_HYPERV_STIMER: + if (def->hyperv_features[j] =3D=3D VIR_TRISTATE_SWITCH_ON && + def->hyperv_stimer_direct =3D=3D VIR_TRISTATE_SWITCH_ON) { + virBufferAddLit(&hypervChildBuf, "\n= "); + } + + break; + + case VIR_DOMAIN_HYPERV_VENDOR_ID: + if (def->hyperv_features[j] =3D=3D VIR_TRISTATE_SWITCH_ON) { + virBufferEscapeString(&hypervAttrBuf, " value=3D'%s'", + def->hyperv_vendor_id); + } + break; + + case VIR_DOMAIN_HYPERV_TLBFLUSH: + if (def->hyperv_features[j] !=3D VIR_TRISTATE_SWITCH_ON) + break; + + if (def->hyperv_tlbflush_direct =3D=3D VIR_TRISTATE_SWITCH_ON) + virBufferAddLit(&hypervChildBuf, "\n= "); + if (def->hyperv_tlbflush_extended =3D=3D VIR_TRISTATE_SWITCH_O= N) + virBufferAddLit(&hypervChildBuf, "= \n"); + break; + + case VIR_DOMAIN_HYPERV_LAST: + break; + } + + virXMLFormatElement(&tmpChildBuf, virDomainHypervTypeToString(j), + &hypervAttrBuf, &hypervChildBuf); + } + + virBufferAddBuffer(buf, &tmpChildBuf); + virBufferAddLit(buf, "\n"); +} + static int virDomainDefFormatFeatures(virBuffer *buf, virDomainDef *def) @@ -28678,80 +28761,7 @@ virDomainDefFormatFeatures(virBuffer *buf, break; =20 case VIR_DOMAIN_FEATURE_HYPERV: - if (def->features[i] =3D=3D VIR_DOMAIN_HYPERV_MODE_NONE) - break; - - virBufferAsprintf(&childBuf, "\n", - virDomainHyperVModeTypeToString(def->feature= s[i])); - - for (j =3D 0; j < VIR_DOMAIN_HYPERV_LAST; j++) { - g_auto(virBuffer) hypervAttrBuf =3D VIR_BUFFER_INITIALIZER; - g_auto(virBuffer) hypervChildBuf =3D VIR_BUFFER_INIT_CHILD= (&tmpChildBuf); - - if (def->hyperv_features[j] =3D=3D VIR_TRISTATE_SWITCH_ABS= ENT) - continue; - - virBufferAsprintf(&hypervAttrBuf, " state=3D'%s'", - virTristateSwitchTypeToString(def->hyper= v_features[j])); - - switch ((virDomainHyperv) j) { - case VIR_DOMAIN_HYPERV_RELAXED: - case VIR_DOMAIN_HYPERV_VAPIC: - case VIR_DOMAIN_HYPERV_VPINDEX: - case VIR_DOMAIN_HYPERV_RUNTIME: - case VIR_DOMAIN_HYPERV_SYNIC: - case VIR_DOMAIN_HYPERV_RESET: - case VIR_DOMAIN_HYPERV_FREQUENCIES: - case VIR_DOMAIN_HYPERV_REENLIGHTENMENT: - case VIR_DOMAIN_HYPERV_IPI: - case VIR_DOMAIN_HYPERV_EVMCS: - case VIR_DOMAIN_HYPERV_AVIC: - case VIR_DOMAIN_HYPERV_EMSR_BITMAP: - case VIR_DOMAIN_HYPERV_XMM_INPUT: - break; - - case VIR_DOMAIN_HYPERV_SPINLOCKS: - if (def->hyperv_features[j] =3D=3D VIR_TRISTATE_SWITCH= _ON) { - virBufferAsprintf(&hypervAttrBuf, - " retries=3D'%d'", def->hyperv_s= pinlocks); - } - break; - - case VIR_DOMAIN_HYPERV_STIMER: - if (def->hyperv_features[j] =3D=3D VIR_TRISTATE_SWITCH= _ON && - def->hyperv_stimer_direct =3D=3D VIR_TRISTATE_SWIT= CH_ON) { - virBufferAddLit(&hypervChildBuf, "\n"); - } - - break; - - case VIR_DOMAIN_HYPERV_VENDOR_ID: - if (def->hyperv_features[j] =3D=3D VIR_TRISTATE_SWITCH= _ON) { - virBufferEscapeString(&hypervAttrBuf, " value=3D'%= s'", - def->hyperv_vendor_id); - } - break; - - case VIR_DOMAIN_HYPERV_TLBFLUSH: - if (def->hyperv_features[j] !=3D VIR_TRISTATE_SWITCH_O= N) - break; - - if (def->hyperv_tlbflush_direct =3D=3D VIR_TRISTATE_SW= ITCH_ON) - virBufferAddLit(&hypervChildBuf, "\n"); - if (def->hyperv_tlbflush_extended =3D=3D VIR_TRISTATE_= SWITCH_ON) - virBufferAddLit(&hypervChildBuf, "\n"); - break; - - case VIR_DOMAIN_HYPERV_LAST: - break; - } - - virXMLFormatElement(&tmpChildBuf, virDomainHypervTypeToStr= ing(j), - &hypervAttrBuf, &hypervChildBuf); - } - - virBufferAddBuffer(&childBuf, &tmpChildBuf); - virBufferAddLit(&childBuf, "\n"); + virDomainFeaturesHyperVDefFormat(&childBuf, def); break; =20 case VIR_DOMAIN_FEATURE_KVM: --=20 2.49.1