[libvirt] [PATCH] nodedev: Fix missing network devices
Commit id '8708ca01c' added a check to determine whether the NIC had
Switchdev capabilities; however, in doing so inadvertently would cause
network devices without a PCI device to not be added to the node device
database. Thus, network devices having a "computer" as a parent, such
as "net_lo*", "net_virbr*", "net_tun*",
"net_vnet*", etc. were not added.
Alter the check to not even check for Switchdev bits if no PCI device found.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
Found this gem while running the Avocado test suite while doing some
other work. It's only 3.8.0 that'll have the missing devices.
src/util/virnetdev.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 5060d051dc..41ef65d882 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -3236,6 +3236,14 @@ virNetDevSwitchdevFeature(const char *ifname,
if (is_vf == 1 && virNetDevGetPhysicalFunction(ifname, &pfname) < 0)
goto cleanup;
+ pci_device_ptr = pfname ? virNetDevGetPCIDevice(pfname) :
+ virNetDevGetPCIDevice(ifname);
+ /* No PCI device, then no feature bit to check/add */
+ if (pci_device_ptr == NULL) {
+ ret = 0;
+ goto cleanup;
+ }
+
if (!(nl_msg = nlmsg_alloc_simple(family_id,
NLM_F_REQUEST | NLM_F_ACK))) {
virReportOOMError();
@@ -3248,11 +3256,6 @@ virNetDevSwitchdevFeature(const char *ifname,
gmsgh->cmd = DEVLINK_CMD_ESWITCH_GET;
gmsgh->version = DEVLINK_GENL_VERSION;
- pci_device_ptr = pfname ? virNetDevGetPCIDevice(pfname) :
- virNetDevGetPCIDevice(ifname);
- if (pci_device_ptr == NULL)
- goto cleanup;
-
pci_name = virPCIDeviceGetName(pci_device_ptr);
if (nla_put(nl_msg, DEVLINK_ATTR_BUS_NAME, strlen("pci")+1,
"pci") < 0 ||
--
2.13.6