From af0cdb7647f6bd8585f6b9f88d351274bfa44774 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 4 Apr 2023 08:53:45 +0000 Subject: [PATCH] import libvirt-8.0.0-10.4.module+el8.7.0+18295+4ee500a4 --- ...ET_TYPE_ETHERNET-not-share-host-view.patch | 46 +++++++++++++ ...cpi-Add-PCIe-5.0-and-6.0-link-speeds.patch | 65 +++++++++++++++++++ SPECS/libvirt.spec | 10 ++- 3 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 SOURCES/libvirt-conf-Make-VIR_DOMAIN_NET_TYPE_ETHERNET-not-share-host-view.patch create mode 100644 SOURCES/libvirt-vircpi-Add-PCIe-5.0-and-6.0-link-speeds.patch diff --git a/SOURCES/libvirt-conf-Make-VIR_DOMAIN_NET_TYPE_ETHERNET-not-share-host-view.patch b/SOURCES/libvirt-conf-Make-VIR_DOMAIN_NET_TYPE_ETHERNET-not-share-host-view.patch new file mode 100644 index 0000000..1c7bab7 --- /dev/null +++ b/SOURCES/libvirt-conf-Make-VIR_DOMAIN_NET_TYPE_ETHERNET-not-share-host-view.patch @@ -0,0 +1,46 @@ +From facb1f67ffca12cbe87abb50f1900956624c9774 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michal Privoznik +Date: Thu, 24 Nov 2022 10:28:59 +0100 +Subject: [PATCH] conf: Make VIR_DOMAIN_NET_TYPE_ETHERNET not share 'host view' + +When setting up QoS for a domain , or when reporting +its statistics we may need to swap TX/RX values. This is all +explained in comment to virDomainNetTypeSharesHostView(). +However, this function claims that VIR_DOMAIN_NET_TYPE_ETHERNET +also shares the 'host view', meaning the TX/RX values must be +swapped. But that's not true. + +An easy reproducer is to start a domain with two -s: +one type of network, the other of type ethernet and configure the +same for both. Reversed setting can then be observed +(e.g. via tc). + +Reported-by: Oleg Vasilev +Signed-off-by: Michal Privoznik +Reviewed-by: Jiri Denemark +(cherry picked from commit 0862cb3ce46253a58ca02d36b2b6a6397a60bfc7) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2173976 +Signed-off-by: Michal Privoznik +--- + src/conf/domain_conf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index 95afd9226e..b3bc027fd9 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -30473,9 +30473,9 @@ virDomainNetTypeSharesHostView(const virDomainNetDef *net) + virDomainNetType actualType = virDomainNetGetActualType(net); + switch (actualType) { + case VIR_DOMAIN_NET_TYPE_DIRECT: +- case VIR_DOMAIN_NET_TYPE_ETHERNET: + return true; + case VIR_DOMAIN_NET_TYPE_USER: ++ case VIR_DOMAIN_NET_TYPE_ETHERNET: + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + case VIR_DOMAIN_NET_TYPE_SERVER: + case VIR_DOMAIN_NET_TYPE_CLIENT: +-- +2.39.2 + diff --git a/SOURCES/libvirt-vircpi-Add-PCIe-5.0-and-6.0-link-speeds.patch b/SOURCES/libvirt-vircpi-Add-PCIe-5.0-and-6.0-link-speeds.patch new file mode 100644 index 0000000..ea4e7d5 --- /dev/null +++ b/SOURCES/libvirt-vircpi-Add-PCIe-5.0-and-6.0-link-speeds.patch @@ -0,0 +1,65 @@ +From e37daa747c6615da25a9285be580a05081b14993 Mon Sep 17 00:00:00 2001 +Message-Id: +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=2170233 +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/SPECS/libvirt.spec b/SPECS/libvirt.spec index ae082d0..44ee06f 100644 --- a/SPECS/libvirt.spec +++ b/SPECS/libvirt.spec @@ -210,7 +210,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 8.0.0 -Release: 10.2%{?dist}%{?extra_release} +Release: 10.4%{?dist}%{?extra_release} License: LGPLv2+ URL: https://libvirt.org/ @@ -277,6 +277,8 @@ Patch54: libvirt-util-json-Split-out-array-strinlist-conversion-from-virJSONValu Patch55: libvirt-qemuAgentGetDisks-Don-t-use-virJSONValueObjectGetStringArray-for-optional-data.patch Patch56: libvirt-build-Only-install-libvirt-guests-when-building-libvirtd.patch Patch57: libvirt-tools-Fix-install_mode-for-some-scripts.patch +Patch58: libvirt-vircpi-Add-PCIe-5.0-and-6.0-link-speeds.patch +Patch59: libvirt-conf-Make-VIR_DOMAIN_NET_TYPE_ETHERNET-not-share-host-view.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -2150,6 +2152,12 @@ exit 0 %changelog +* Thu Mar 2 2023 Jiri Denemark - 8.0.0-10.4.el8 +- conf: Make VIR_DOMAIN_NET_TYPE_ETHERNET not share 'host view' (rhbz#2173976) + +* Fri Feb 17 2023 Jiri Denemark - 8.0.0-10.3.el8 +- vircpi: Add PCIe 5.0 and 6.0 link speeds (rhbz#2170233) + * Thu Jan 5 2023 Jiri Denemark - 8.0.0-10.2.el8 - util: json: Split out array->strinlist conversion from virJSONValueObjectGetStringArray (rhbz#2152079) - qemuAgentGetDisks: Don't use virJSONValueObjectGetStringArray for optional data (rhbz#2152079)