From f76848a7c11281c09c66086cafe66926d73170fa Mon Sep 17 00:00:00 2001 From: zhenwei pi Date: Thu, 15 Oct 2020 19:21:15 +0800 Subject: [PATCH] util: rename virNetDevParseVfConfig to virNetDevParseVfInfo virNetDevParseVfConfig has became a multifunctional helper function, rename it to virNetDevParseVfInfo. Signed-off-by: zhenwei pi Reviewed-by: Laine Stump --- src/util/virnetdev.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index f53e1751b3..088f35621d 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1660,9 +1660,15 @@ virNetDevSetVfConfig(const char *ifname, int vf, goto cleanup; } +/** + * virNetDevParseVfInfo: + * Get the VF interface infomation from kernel by netlink, To make netlink + * parsing logic easy to maintain, extending this function to get some new + * data is better than add a new function. + */ static int -virNetDevParseVfConfig(struct nlattr **tb, int32_t vf, virMacAddrPtr mac, - int *vlanid, virDomainInterfaceStatsPtr stats) +virNetDevParseVfInfo(struct nlattr **tb, int32_t vf, virMacAddrPtr mac, + int *vlanid, virDomainInterfaceStatsPtr stats) { int rc = -1; struct ifla_vf_mac *vf_mac; @@ -1746,7 +1752,7 @@ virNetDevGetVfConfig(const char *ifname, int vf, virMacAddrPtr mac, if (virNetlinkDumpLink(ifname, ifindex, &nlData, tb, 0, 0) < 0) return -1; - return virNetDevParseVfConfig(tb, vf, mac, vlanid, NULL); + return virNetDevParseVfInfo(tb, vf, mac, vlanid, NULL); } @@ -1782,7 +1788,7 @@ virNetDevVFInterfaceStats(virPCIDeviceAddressPtr vfAddr, if (virNetlinkDumpLink(pfname, -1, &nlData, tb, 0, 0) < 0) return -1; - return virNetDevParseVfConfig(tb, vf, NULL, NULL, stats); + return virNetDevParseVfInfo(tb, vf, NULL, NULL, stats); }