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=1759930047; cv=none; d=zohomail.com; s=zohoarc; b=FSkJixGht2fBcQbHzAIGmBsm0k3F0v813yiMHdBtdo29f5aftw+zwkCNTB6osQuTXTCs79ASempapgCHMQBPPHxlRj9GdWHb70XlM+2L1uAYxL4ZUx+Md9Jqb2OJlWjzIz9bT12QzavHBum9SDTL3/HNYhzg6Qbaj7VkoKpn1wY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759930047; 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=hdNTTMUweSCy9SfNuWsqyQeBr6nK+JQW0P8YOL/oUzQ=; b=VKEfT5vQeyM3lHJrsC0aLz2unZzbP2vJW1v9nifpWg1CTmPmYQnFU9UNvvRKJyYcjjHw/hXVveqIJmbG1liWQ4UQ5dIEOcHhvzYa7xu0X/QcFZxMbrCiLGZDOB+u6g7w2uYUPCa9cTksZFvIjpel42hlN6knX9N2niAraxkG1q4= 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 1759930047341105.9881622667018; Wed, 8 Oct 2025 06:27:27 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A07EF41A4D; Wed, 8 Oct 2025 09:27:26 -0400 (EDT) Received: from [172.19.199.17] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 2E2D344577; Wed, 8 Oct 2025 09:18:05 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id ED439441B5; Wed, 8 Oct 2025 08:55:43 -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 D8A7E4420D for ; Wed, 8 Oct 2025 08:54:34 -0400 (EDT) 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-567-omge9zzSNUqUK3z9NJJmhA-1; Wed, 08 Oct 2025 08:54:33 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5E55219560AE for ; Wed, 8 Oct 2025 12:54:32 +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 A939919560A2 for ; Wed, 8 Oct 2025 12:54:31 +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=1759928074; 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=hdNTTMUweSCy9SfNuWsqyQeBr6nK+JQW0P8YOL/oUzQ=; b=bQuBd/y7OyIl7gVNk1BsGlTYhj/OvwePDHIw4SKokTIqg+MAs3C8I9GFeWhVcduDNRUWkh Z0Dbad6UqBc9qTJQsOuFnb3THvKiCefdb6b/6KgwqxHbAVKKAP9bYGyGvKmh7A6kUagFNW lJt1Y/4ObdcHmNzzwoYkJa356PDKNYA= X-MC-Unique: omge9zzSNUqUK3z9NJJmhA-1 X-Mimecast-MFC-AGG-ID: omge9zzSNUqUK3z9NJJmhA_1759928072 To: devel@lists.libvirt.org Subject: [PATCH v2 23/29] conf: Report default hyperv values in domain capabilities Date: Wed, 8 Oct 2025 14:53:55 +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: t-aEWq_lsASo34JuxjFlRtkLImi2cIg30cKIz_H9q7w_1759928072 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: W2LNUP7SXKZZRAMMVLRNCLLQF7XEBD6F X-Message-ID-Hash: W2LNUP7SXKZZRAMMVLRNCLLQF7XEBD6F 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: 1759930049132154101 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik So far the set of available Hyper-V enlightenments are reported in domain capabilities. Well, some enlightenments are more than just simple on/off switch. For instance, the 'spinlocks' enlightenment expects a number, or 'vendor_id' expects a string. All of these have some default values (at least in QEMU) and are used when the passthrough mode is set. Allow querying these defaults in domain capabilities XML. Signed-off-by: Michal Privoznik --- docs/formatdomaincaps.rst | 5 ++- src/conf/domain_capabilities.c | 61 ++++++++++++++++++++++++++++++++- src/conf/domain_capabilities.h | 11 ++++++ src/conf/schemas/domaincaps.rng | 29 ++++++++++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 12 +++---- 6 files changed, 111 insertions(+), 9 deletions(-) diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst index 4eb8211b09..32dc09d41e 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -869,7 +869,10 @@ Hyper-V Enlightenments Report which features improving behavior of guests running Microsoft Windo= ws are supported. The ``features`` enum corresponds to the ```` elem= ent (well, its children) as documented in `Hypervisor features -`__. +`__. The ``defaults`` element then +contains child elements describing default values as reported by hyperviso= r, +e.h. whether direct or extended TLB flushes are available. :since:`(since +11.9.0)` =20 Launch security ^^^^^^^^^^^^^^^ diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index f29c4e0515..422b68c085 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -92,6 +92,32 @@ virSGXCapabilitiesFree(virSGXCapability *cap) } =20 =20 +void +virDomainCapsFeatureHypervFree(virDomainCapsFeatureHyperv *cap) +{ + if (!cap) + return; + + g_free(cap->vendor_id); + g_free(cap); +} + + +virDomainCapsFeatureHyperv * +virDomainCapsFeatureHypervCopy(virDomainCapsFeatureHyperv *cap) +{ + virDomainCapsFeatureHyperv *ret =3D NULL; + + if (!cap) + return NULL; + + ret =3D g_memdup2(cap, sizeof(virDomainCapsFeatureHyperv)); + ret->vendor_id =3D g_strdup(cap->vendor_id); + + return ret; +} + + static void virDomainCapsDispose(void *obj) { @@ -105,7 +131,7 @@ virDomainCapsDispose(void *obj) virCPUDefFree(caps->cpu.hostModel); virSEVCapabilitiesFree(caps->sev); virSGXCapabilitiesFree(caps->sgx); - g_free(caps->hyperv); + virDomainCapsFeatureHypervFree(caps->hyperv); =20 values =3D &caps->os.loader.values; for (i =3D 0; i < values->nvalues; i++) @@ -791,6 +817,8 @@ static void virDomainCapsFeatureHypervFormat(virBuffer *buf, const virDomainCapsFeatureHyperv *hyperv) { + virBuffer defaults =3D VIR_BUFFER_INIT_CHILD(buf); + if (!hyperv) return; =20 @@ -798,6 +826,37 @@ virDomainCapsFeatureHypervFormat(virBuffer *buf, =20 ENUM_PROCESS(hyperv, features, virDomainHypervTypeToString); =20 + virBufferAdjustIndent(&defaults, 2); + + if (VIR_DOMAIN_CAPS_ENUM_IS_SET(hyperv->features, VIR_DOMAIN_HYPERV_SP= INLOCKS) && + hyperv->spinlocks !=3D 0) { + virBufferAsprintf(&defaults, "%u\n", hyperv= ->spinlocks); + } + + if (VIR_DOMAIN_CAPS_ENUM_IS_SET(hyperv->features, VIR_DOMAIN_HYPERV_ST= IMER) && + hyperv->stimer_direct !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(&defaults, "%s\n", + virTristateSwitchTypeToString(hyperv->stimer_dir= ect)); + } + + if (VIR_DOMAIN_CAPS_ENUM_IS_SET(hyperv->features, VIR_DOMAIN_HYPERV_TL= BFLUSH)) { + if (hyperv->tlbflush_direct !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(&defaults, "%s\n", + virTristateSwitchTypeToString(hyperv->tlbflu= sh_direct)); + } + + if (hyperv->tlbflush_extended !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(&defaults, "%s\n", + virTristateSwitchTypeToString(hyperv->tlbflu= sh_extended)); + } + } + + if (VIR_DOMAIN_CAPS_ENUM_IS_SET(hyperv->features, VIR_DOMAIN_HYPERV_VE= NDOR_ID)) { + virBufferEscapeString(&defaults, "%s\n", hy= perv->vendor_id); + } + + virXMLFormatElement(buf, "defaults", NULL, &defaults); + FORMAT_EPILOGUE(hyperv); } =20 diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index 43141dbdd5..437981c711 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -163,6 +163,11 @@ typedef struct _virDomainCapsFeatureHyperv virDomainCa= psFeatureHyperv; struct _virDomainCapsFeatureHyperv { virTristateBool supported; virDomainCapsEnum features; /* Info about supported virDomainHyperv fe= atures */ + unsigned int spinlocks; + virTristateSwitch stimer_direct; + virTristateSwitch tlbflush_direct; + virTristateSwitch tlbflush_extended; + char *vendor_id; }; =20 STATIC_ASSERT_ENUM(VIR_DOMAIN_LAUNCH_SECURITY_LAST); @@ -378,3 +383,9 @@ void virSGXCapabilitiesFree(virSGXCapability *capabilities); =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSGXCapability, virSGXCapabilitiesFree); + +void virDomainCapsFeatureHypervFree(virDomainCapsFeatureHyperv *capabiliti= es); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainCapsFeatureHyperv, virDomainCapsFea= tureHypervFree); + +virDomainCapsFeatureHyperv * +virDomainCapsFeatureHypervCopy(virDomainCapsFeatureHyperv *cap); diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.= rng index 7edae54931..8d0380951d 100644 --- a/src/conf/schemas/domaincaps.rng +++ b/src/conf/schemas/domaincaps.rng @@ -509,6 +509,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1a4f47aabc..26776dff2a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -217,6 +217,8 @@ virDomainCapsCPUUsableTypeFromString; virDomainCapsCPUUsableTypeToString; virDomainCapsEnumClear; virDomainCapsEnumSet; +virDomainCapsFeatureHypervCopy; +virDomainCapsFeatureHypervFree; virDomainCapsFormat; virDomainCapsNew; virSEVCapabilitiesFree; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5b485d7bfb..2ccddbfcaa 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2070,8 +2070,7 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps *qemuCaps) if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC)) virQEMUCapsSGXInfoCopy(&ret->sgxCapabilities, qemuCaps->sgxCapabil= ities); =20 - ret->hypervCapabilities =3D g_memdup2(qemuCaps->hypervCapabilities, - sizeof(virDomainCapsFeatureHyperv)= ); + ret->hypervCapabilities =3D virDomainCapsFeatureHypervCopy(qemuCaps->h= ypervCapabilities); =20 return g_steal_pointer(&ret); } @@ -2113,7 +2112,7 @@ void virQEMUCapsDispose(void *obj) virSEVCapabilitiesFree(qemuCaps->sevCapabilities); virSGXCapabilitiesFree(qemuCaps->sgxCapabilities); =20 - g_free(qemuCaps->hypervCapabilities); + virDomainCapsFeatureHypervFree(qemuCaps->hypervCapabilities); =20 virQEMUCapsAccelClear(&qemuCaps->kvm); virQEMUCapsAccelClear(&qemuCaps->hvf); @@ -3138,7 +3137,7 @@ static int virQEMUCapsProbeHypervCapabilities(virQEMUCaps *qemuCaps, qemuMonitorCPUModelInfo *fullQEMU) { - g_autofree virDomainCapsFeatureHyperv *hvcaps =3D NULL; + g_autoptr(virDomainCapsFeatureHyperv) hvcaps =3D NULL; size_t i; =20 if (!fullQEMU) @@ -4494,7 +4493,7 @@ static int virQEMUCapsParseHypervCapabilities(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt) { - g_autofree virDomainCapsFeatureHyperv *hvcaps =3D NULL; + g_autoptr(virDomainCapsFeatureHyperv) hvcaps =3D NULL; xmlNodePtr n =3D NULL; g_autofree xmlNodePtr *capNodes =3D NULL; int ncapNodes; @@ -6930,8 +6929,7 @@ static void virQEMUCapsFillDomainFeatureHypervCaps(virQEMUCaps *qemuCaps, virDomainCaps *domCaps) { - domCaps->hyperv =3D g_memdup2(qemuCaps->hypervCapabilities, - sizeof(virDomainCapsFeatureHyperv)); + domCaps->hyperv =3D virDomainCapsFeatureHypervCopy(qemuCaps->hypervCap= abilities); } =20 =20 --=20 2.49.1