From 0b10ce26a491d1335145a36b2f5f1d6fc307483d Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Thu, 9 Feb 2023 16:25:09 +0100 Subject: [PATCH] libvirt-8.0.0-17.el8 --- ...cpi-Add-PCIe-5.0-and-6.0-link-speeds.patch | 65 +++++++++++++++++++ libvirt.spec | 6 +- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 libvirt-vircpi-Add-PCIe-5.0-and-6.0-link-speeds.patch diff --git a/libvirt-vircpi-Add-PCIe-5.0-and-6.0-link-speeds.patch b/libvirt-vircpi-Add-PCIe-5.0-and-6.0-link-speeds.patch new file mode 100644 index 0000000..0efd778 --- /dev/null +++ b/libvirt-vircpi-Add-PCIe-5.0-and-6.0-link-speeds.patch @@ -0,0 +1,65 @@ +From 0a192b453da043cfb3679a07b55c1628b56efdde Mon Sep 17 00:00:00 2001 +Message-Id: <0a192b453da043cfb3679a07b55c1628b56efdde@dist-git> +From: Michal Privoznik +Date: Fri, 8 Jul 2022 14:29:32 +0200 +Subject: [PATCH] vircpi: Add PCIe 5.0 and 6.0 link speeds +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The PCIe 5.0 and PCIe 6.0 standards define new link speeds: +32GT/s and 64GT/s, respectively. Update our internal enum to +include these new speeds. Otherwise we format incorrect XML: + + + + + + +Like all "good" specifications, these are also locked behind a +login portal. But we can look at pciutils' source code: [1] and +[2]. + +1: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/commit/ls-caps.c?id=caca31a0eea41c7b051705704c1158fddc02fbd2 +2: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/commit/ls-caps.c?id=5bdf63b6b1bc35b59c4b3f47f7ca83ca1868155b + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2105231 +Signed-off-by: Michal Privoznik +Reviewed-by: Ján Tomko +(cherry picked from commit d33c2a9e2f933b31f8e96e9938c237bdffe27f84) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2168116 +Signed-off-by: Michal Privoznik +--- + src/util/virpci.c | 2 +- + src/util/virpci.h | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/util/virpci.c b/src/util/virpci.c +index 0d476cd8b4..4949d1a3d4 100644 +--- a/src/util/virpci.c ++++ b/src/util/virpci.c +@@ -46,7 +46,7 @@ VIR_LOG_INIT("util.pci"); + + VIR_ENUM_IMPL(virPCIELinkSpeed, + VIR_PCIE_LINK_SPEED_LAST, +- "", "2.5", "5", "8", "16", ++ "", "2.5", "5", "8", "16", "32", "64" + ); + + VIR_ENUM_IMPL(virPCIStubDriver, +diff --git a/src/util/virpci.h b/src/util/virpci.h +index b9b9cd7b34..4d9193f24e 100644 +--- a/src/util/virpci.h ++++ b/src/util/virpci.h +@@ -83,6 +83,8 @@ typedef enum { + VIR_PCIE_LINK_SPEED_5, + VIR_PCIE_LINK_SPEED_8, + VIR_PCIE_LINK_SPEED_16, ++ VIR_PCIE_LINK_SPEED_32, ++ VIR_PCIE_LINK_SPEED_64, + VIR_PCIE_LINK_SPEED_LAST + } virPCIELinkSpeed; + +-- +2.39.1 + diff --git a/libvirt.spec b/libvirt.spec index 8efdf22..0627d96 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -210,7 +210,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 8.0.0 -Release: 16%{?dist}%{?extra_release} +Release: 17%{?dist}%{?extra_release} License: LGPLv2+ URL: https://libvirt.org/ @@ -302,6 +302,7 @@ Patch79: libvirt-nodedev-add-tests-for-optional-device-address-to-css-device.pat Patch80: libvirt-nodedev-prevent-internal-error-on-dev_busid-parse.patch Patch81: libvirt-rpc-Fix-memory-leak-of-fds.patch Patch82: libvirt-qemu_namespace-Don-t-leak-memory-in-qemuDomainGetPreservedMounts.patch +Patch83: libvirt-vircpi-Add-PCIe-5.0-and-6.0-link-speeds.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -2181,6 +2182,9 @@ exit 0 %changelog +* Thu Feb 9 2023 Jiri Denemark - 8.0.0-17 +- vircpi: Add PCIe 5.0 and 6.0 link speeds (rhbz#2168116) + * Wed Feb 8 2023 Jiri Denemark - 8.0.0-16 - qemu_namespace: Don't leak memory in qemuDomainGetPreservedMounts() (rhbz#2166573)