From cbc40bc71899deef353d4c24ca1f246150f9a6fb Mon Sep 17 00:00:00 2001 From: xu_lei_123 Date: Mon, 9 Jan 2023 11:27:43 +0800 Subject: [PATCH] fix sockets info in topology element --- ...Fix-sockets-info-in-topology-element.patch | 28 +++++++++++++++++++ libvirt.spec | 6 +++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 docs-Fix-sockets-info-in-topology-element.patch diff --git a/docs-Fix-sockets-info-in-topology-element.patch b/docs-Fix-sockets-info-in-topology-element.patch new file mode 100644 index 0000000..db6d7db --- /dev/null +++ b/docs-Fix-sockets-info-in-topology-element.patch @@ -0,0 +1,28 @@ +From 296bd87e4ac9520282db95f492f56c64f0ad8ec2 Mon Sep 17 00:00:00 2001 +From: xu_lei_123 +Date: Mon, 9 Jan 2023 11:02:30 +0800 +Subject: [PATCH] fix 'socket' info in topology element + +--- + docs/formatdomain.html.in | 5 +- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in +index aaeb059..e1876cf 100644 +--- a/docs/formatdomain.html.in ++++ b/docs/formatdomain.html.in +@@ -1675,9 +1675,9 @@ +
The topology element specifies requested topology of + virtual CPU provided to the guest. Four attributes, sockets, + dies, cores, and threads, +- accept non-zero positive integer values. They refer to the total number +- of CPU sockets, number of dies per socket, number of cores per die, and +- number of threads per core, respectively. The dies ++ accept non-zero positive integer values. They refer to the number ++ of CPU sockets per NUMA node, number of dies per socket, number of cores ++ per die, and number of threads per core, respectively. The dies + attribute is optional and will default to 1 if omitted, while the other + attributes are all mandatory. Hypervisors may require that the maximum + number of vCPUs specified by the cpus element equals to +-- +2.32.0 (Apple Git-132) diff --git a/libvirt.spec b/libvirt.spec index 1347306..d7890ae 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -101,7 +101,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 6.2.0 -Release: 50 +Release: 51 License: LGPLv2+ URL: https://libvirt.org/ @@ -466,6 +466,7 @@ Patch0353: remote_daemon-Don-t-run-virStateCleanup-if-virStateR.patch Patch0354: virDomainInputDefValidate-Validate-model.patch Patch0355: virsh-Check-whether-enough-arguments-was-passed-to-i.patch Patch0356: virNetDevSaveNetConfig-Pass-mode-to-virFileWriteStr.patch +Patch0357: docs-Fix-sockets-info-in-topology-element.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -2200,6 +2201,9 @@ exit 0 %changelog +* Mon Jan 09 2023 xulei - 6.2.0-51 +- formatdomain.html.in: fix 'socket' info in topology element + * Wed Jan 04 2023 jiangjiacheng - 6.2.0-50 - backport patches from upstream -- Gitee