884d801843
- conf: Parse hyperv features even for host-model (RHEL-151688) - qemu: Wire up new hyperv host-model mode behavior (RHEL-151688) - Introduce EXPAND_CPU_FEATURES flag for domain capabilities (RHEL-153653) - qemu: Implement VIR_CONNECT_GET_DOMAIN_CAPABILITIES_EXPAND_CPU_FEATURES (RHEL-153653) - virsh: Add --expand-cpu-features option for domcapabilities (RHEL-153653) - docs: Clarify host-model description in domain capabilities (RHEL-153653) - qemu: Fix job handling when domain dies in post-copy migration (RHEL-145179) - security_apparmor: Use g_auto* in AppArmorSetSecurityHostdevLabel (RHEL-159902) - security: Cleanup hostdev label error logic (RHEL-159902) - qemu: Fix IOMMUFD and VFIO security labels (RHEL-159902) - viriommufd: Set IOMMU_OPTION_RLIMIT_MODE only when running privileged (RHEL-156803) - conf: Move and rename virStorageSourceFDTuple object (RHEL-156803) - conf: Refactor virHostdevIsPCIDevice (RHEL-156803) - hypervisor: Fix virHostdevNeedsVFIO detection (RHEL-156803) - qemu: Expand call to qemuDomainNeedsVFIO (RHEL-156803) - qemu: Update qemuDomainNeedsVFIO to ignore PCI hostdev with IOMMUFD (RHEL-156803) - src: Use virHostdevIsPCIDeviceWith* to check for IOMMUFD (RHEL-156803) - conf: Introduce domain iommufd element (RHEL-156803) - qemu: Implement iommufd (RHEL-156803) - conf: Add iommufd fdgroup support (RHEL-156803) - qemu: Implement iommufd fdgroup (RHEL-156803) - tests: Add iommufd fdgroup test (RHEL-156803) - hypervisor: Call virWaitForDevices() after detaching host devices (RHEL-156803) - qemuMigrationSrcBeginXML: Don't call 'qemuMigrationSrcBeginPhaseBlockDirtyBitmaps' with offline VM (RHEL-173433) - qemuMigrationSrcBeginPhase: Don't call 'qemuBlockNodesEnsureActive' with offline VM (RHEL-173433) - util: virGetSubIDs: do not limit file size (RHEL-174491) - cpu_conf: Introduce virCPUDefSortFeatures (RHEL-177364) - qemu_capabilities: Split virQEMUCapsFillDomainCPUCaps (RHEL-177364) - qemu: Move domain caps flags handling to virQEMUCapsFillDomainCPUHostModel (RHEL-177364) - qemu_capabilities: Always sort features in host-model CPU (RHEL-177364) - qemu_capabilities: Use g_autoptr in virQEMUCapsInitHostCPUModel (RHEL-177364) - qemu_capabilities: Split conditions in virQEMUCapsInitHostCPUModel (RHEL-177364) - qemu_capabilities: Cache expanded CPU (RHEL-177364) - domaincapstest: Test EXPAND_CPU_FEATURES flag (RHEL-177364) - util: Publish and mock virHostCPUGetMSRFromKVM (RHEL-177364) - cpu_x86: Introduce virCPUx86DataAddMSR (RHEL-177364) - cpu: Introduce virCPUUpdateFeatures (RHEL-177364) - Fix documentation of VIR_CONNECT_GET_DOMAIN_CAPABILITIES_EXPAND_CPU_FEATURES (RHEL-177364) - Introduce VIR_CONNECT_GET_DOMAIN_CAPABILITIES_SUPPORTED_CPU_FEATURES flag (RHEL-177364) - virsh: Add --supported-cpu-features option for domcapabilities (RHEL-177364) - domaincapstest: Test SUPPORTED_CPU_FEATURES flag (RHEL-177364) - qemu_capabilities: Fix domain capabilities on AMD CPUs (RHEL-177364) - distro: Replace old gating with tmt Resolves: RHEL-145179, RHEL-151688, RHEL-153653, RHEL-156803, RHEL-159902 Resolves: RHEL-173433, RHEL-174491, RHEL-177364
74 lines
2.9 KiB
Diff
74 lines
2.9 KiB
Diff
From 7a8f13f443843e8903ab18d5917f6f8bc4192dd6 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <7a8f13f443843e8903ab18d5917f6f8bc4192dd6.1780571167.git.jdenemar@redhat.com>
|
|
From: Jiri Denemark <jdenemar@redhat.com>
|
|
Date: Tue, 26 May 2026 15:38:59 +0200
|
|
Subject: [PATCH] Fix documentation of
|
|
VIR_CONNECT_GET_DOMAIN_CAPABILITIES_EXPAND_CPU_FEATURES
|
|
|
|
The flag is designed for expanding the CPU model used by host-model. But
|
|
the documentation was sometimes describing it as showing all CPU
|
|
features supported on the host, which is wrong as the host may support
|
|
features that would not be enabled in host-model.
|
|
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
|
|
(cherry picked from commit 090183a7dc4a64cca83937eff9a4e93a45b4d712)
|
|
|
|
https://redhat.atlassian.net/browse/RHEL-177364
|
|
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
---
|
|
docs/manpages/virsh.rst | 5 +++--
|
|
src/libvirt-domain.c | 6 +++---
|
|
tools/virsh-host.c | 2 +-
|
|
3 files changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
|
|
index 85fa6ab011..7169b6bc05 100644
|
|
--- a/docs/manpages/virsh.rst
|
|
+++ b/docs/manpages/virsh.rst
|
|
@@ -640,8 +640,9 @@ flagged as deprecated for the CPU model by the hypervisor. These
|
|
features will be paired with the "disable" policy.
|
|
|
|
The **--expand-cpu-features** option will cause the host-model CPU definition
|
|
-to contain all CPU features supported on the host including those implicitly
|
|
-enabled by the selected CPU model.
|
|
+to contain all required CPU features including those implicitly enabled by the
|
|
+selected CPU model. Without this flag features that are part of the CPU model
|
|
+itself will not be listed.
|
|
|
|
|
|
pool-capabilities
|
|
diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
|
|
index 034f126dd5..e146fa7e82 100644
|
|
--- a/src/libvirt-domain.c
|
|
+++ b/src/libvirt-domain.c
|
|
@@ -12331,9 +12331,9 @@ virDomainSetUserPassword(virDomainPtr dom,
|
|
* passthrough and so on.
|
|
*
|
|
* If @flags includes VIR_CONNECT_GET_DOMAIN_CAPABILITIES_EXPAND_CPU_FEATURES,
|
|
- * libvirt will explicitly list all CPU features (in host-model CPU definition)
|
|
- * that are supported on the host. Without this flag features that are part of
|
|
- * the CPU model itself will not be listed.
|
|
+ * libvirt will explicitly list all CPU features that will be enabled for
|
|
+ * host-model CPU mode. Without this flag features that are part of the CPU
|
|
+ * model itself will not be listed.
|
|
*
|
|
* Returns NULL in case of error or an XML string
|
|
* defining the capabilities.
|
|
diff --git a/tools/virsh-host.c b/tools/virsh-host.c
|
|
index dd98917fa8..5dbeb54ae5 100644
|
|
--- a/tools/virsh-host.c
|
|
+++ b/tools/virsh-host.c
|
|
@@ -120,7 +120,7 @@ static const vshCmdOptDef opts_domcapabilities[] = {
|
|
},
|
|
{.name = "expand-cpu-features",
|
|
.type = VSH_OT_BOOL,
|
|
- .help = N_("show all features in host CPU model"),
|
|
+ .help = N_("expand 'host-model' CPU to also show features enabled by the CPU model"),
|
|
},
|
|
{.name = NULL}
|
|
};
|
|
--
|
|
2.54.0
|