diff -Nru libvirt-6.0.0/debian/changelog libvirt-6.0.0/debian/changelog --- libvirt-6.0.0/debian/changelog 2021-07-16 17:16:36.000000000 +1200 +++ libvirt-6.0.0/debian/changelog 2021-09-14 14:00:49.000000000 +1200 @@ -1,3 +1,12 @@ +libvirt (6.0.0-0ubuntu8.14) focal; urgency=medium + + * Fixup backport of "util: Add phys_port_name support on virPCIGetNetName" + to include the incorrectly removed "firstEntryName = NULL;" line, which + caused a regression bringing up network pools. (LP: #1943481) + - d/p/u/lp-1892132-Add-phys_port_name-support-on-virPCIGetNetName.patch + + -- Matthew Ruffell Tue, 14 Sep 2021 14:00:49 +1200 + libvirt (6.0.0-0ubuntu8.13) focal; urgency=medium * Add support for switchdev NICs that link representor ports to parent PCI diff -Nru libvirt-6.0.0/debian/patches/ubuntu/lp-1892132-Add-phys_port_name-support-on-virPCIGetNetName.patch libvirt-6.0.0/debian/patches/ubuntu/lp-1892132-Add-phys_port_name-support-on-virPCIGetNetName.patch --- libvirt-6.0.0/debian/patches/ubuntu/lp-1892132-Add-phys_port_name-support-on-virPCIGetNetName.patch 2021-07-16 17:16:36.000000000 +1200 +++ libvirt-6.0.0/debian/patches/ubuntu/lp-1892132-Add-phys_port_name-support-on-virPCIGetNetName.patch 2021-09-14 13:58:32.000000000 +1200 @@ -81,7 +81,7 @@ } *netname = g_strdup(entry->d_name); -@@ -2493,24 +2517,21 @@ virPCIGetNetName(const char *device_link_sysfs_path, +@@ -2493,24 +2517,22 @@ virPCIGetNetName(const char *device_link_sysfs_path, } if (ret < 0) { @@ -110,6 +110,7 @@ + * (probably only) netname we found. + */ + *netname = firstEntryName; ++ firstEntryName = NULL; + ret = 0; } else { - ret = 0; /* no netdev at the given index is *not* an error */