[libvirt] [PATCH 3/3] util: match phys_port_id when converting PF-netdev to/from VF-netdev
This patch updates functions in netdev.c to pay attention to
phys_port_id. It uses the new function virNetDevGetPhysPortID() to
learn the phys_port_id of a VF or PF, then sends that info to
virPCIGetNetName(), which has newly been modified to take an optional
phys_port_id.
---
src/util/virnetdev.c | 33 ++++++++++++++++++++++++++++-----
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 1c150b7d7..83b255219 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -1231,13 +1231,17 @@ virNetDevGetVirtualFunctions(const char *pfname,
char *pf_sysfs_device_link = NULL;
char *pci_sysfs_device_link = NULL;
char *pciConfigAddr = NULL;
+ char *pfPhysPortID = NULL;
*virt_fns = NULL;
*n_vfname = 0;
*max_vfs = 0;
+ if (virNetDevGetPhysPortID(pfname, &pfPhysPortID) < 0)
+ goto cleanup;
+
if (virNetDevSysfsFile(&pf_sysfs_device_link, pfname, "device") <
0)
- return ret;
+ goto cleanup;
if (virPCIGetVirtualFunctions(pf_sysfs_device_link, virt_fns,
n_vfname, max_vfs) < 0)
@@ -1262,8 +1266,10 @@ virNetDevGetVirtualFunctions(const char *pfname,
goto cleanup;
}
- if (virPCIGetNetName(pci_sysfs_device_link, NULL, &((*vfname)[i])) < 0)
+ if (virPCIGetNetName(pci_sysfs_device_link,
+ pfPhysPortID, &((*vfname)[i])) < 0) {
goto cleanup;
+ }
if (!(*vfname)[i])
VIR_INFO("VF does not have an interface name");
@@ -1276,6 +1282,7 @@ virNetDevGetVirtualFunctions(const char *pfname,
VIR_FREE(*vfname);
VIR_FREE(*virt_fns);
}
+ VIR_FREE(pfPhysPortID);
VIR_FREE(pf_sysfs_device_link);
VIR_FREE(pci_sysfs_device_link);
VIR_FREE(pciConfigAddr);
@@ -1357,13 +1364,19 @@ int
virNetDevGetPhysicalFunction(const char *ifname, char **pfname)
{
char *physfn_sysfs_path = NULL;
+ char *vfPhysPortID = NULL;
int ret = -1;
+ if (virNetDevGetPhysPortID(ifname, &vfPhysPortID) < 0)
+ goto cleanup;
+
if (virNetDevSysfsDeviceFile(&physfn_sysfs_path, ifname, "physfn") <
0)
- return ret;
+ goto cleanup;
- if (virPCIGetNetName(physfn_sysfs_path, NULL, pfname) < 0)
+ if (virPCIGetNetName(physfn_sysfs_path,
+ vfPhysPortID, pfname) < 0) {
goto cleanup;
+ }
if (!*pfname) {
/* this shouldn't be possible. A VF can't exist unless its
@@ -1377,6 +1390,7 @@ virNetDevGetPhysicalFunction(const char *ifname, char **pfname)
ret = 0;
cleanup:
+ VIR_FREE(vfPhysPortID);
VIR_FREE(physfn_sysfs_path);
return ret;
}
@@ -1404,8 +1418,16 @@ virNetDevPFGetVF(const char *pfname, int vf, char **vfname)
{
char *virtfnName = NULL;
char *virtfnSysfsPath = NULL;
+ char *pfPhysPortID = NULL;
int ret = -1;
+ /* a VF may have multiple "ports", each one having its own netdev,
+ * and each netdev having a different phys_port_id. Be sure we get
+ * the VF netdev with a phys_port_id matchine that of pfname
+ */
+ if (virNetDevGetPhysPortID(pfname, &pfPhysPortID) < 0)
+ goto cleanup;
+
if (virAsprintf(&virtfnName, "virtfn%d", vf) < 0)
goto cleanup;
@@ -1422,11 +1444,12 @@ virNetDevPFGetVF(const char *pfname, int vf, char **vfname)
* isn't bound to a netdev driver, it won't have a netdev name,
* and vfname will be NULL).
*/
- ret = virPCIGetNetName(virtfnSysfsPath, NULL, vfname);
+ ret = virPCIGetNetName(virtfnSysfsPath, pfPhysPortID, vfname);
cleanup:
VIR_FREE(virtfnName);
VIR_FREE(virtfnSysfsPath);
+ VIR_FREE(pfPhysPortID);
return ret;
}
--
2.13.3