openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Split out virNetDevGetEthtoolGFeatures 

Move out the code depending on HAVE_DECL_ETHTOOL_GFEATURES.
This commit is contained in:
Ján Tomko 2016-06-03 20:25:21 +02:00
parent 970af4a69f
commit 3a7440bdc7
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/util/virnetdev.c
View File

@ -3344,6 +3344,32 @@ virNetDevGFeatureAvailable(const char *ifname, struct ethtool_gfeatures *cmd)
ret = FEATURE_BIT_IS_SET(cmd->features, TX_UDP_TNL, active); ret = FEATURE_BIT_IS_SET(cmd->features, TX_UDP_TNL, active);
return ret; return ret;
} }
static int
virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap,
const char *ifname)
{
struct ethtool_gfeatures *g_cmd;
if (VIR_ALLOC_VAR(g_cmd,
struct ethtool_get_features_block, GFEATURES_SIZE) < 0)
return -1;
g_cmd->cmd = ETHTOOL_GFEATURES;
g_cmd->size = GFEATURES_SIZE;
if (virNetDevGFeatureAvailable(ifname, g_cmd) == 1)
ignore_value(virBitmapSetBit(bitmap, VIR_NET_DEV_FEAT_TXUDPTNL));
VIR_FREE(g_cmd);
return 0;
}
# else
static int
virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap ATTRIBUTE_UNUSED,
const char *ifname ATTRIBUTE_UNUSED)
{
return 0;
}
# endif # endif
@ -3361,10 +3387,6 @@ int
virNetDevGetFeatures(const char *ifname, virNetDevGetFeatures(const char *ifname,
virBitmapPtr *out) virBitmapPtr *out)
{ {
# if HAVE_DECL_ETHTOOL_GFEATURES
struct ethtool_gfeatures *g_cmd;
# endif
if (!(*out = virBitmapNew(VIR_NET_DEV_FEAT_LAST))) if (!(*out = virBitmapNew(VIR_NET_DEV_FEAT_LAST)))
return -1; return -1;
@ -3376,16 +3398,8 @@ virNetDevGetFeatures(const char *ifname,
virNetDevGetEthtoolFeatures(*out, ifname); virNetDevGetEthtoolFeatures(*out, ifname);
# if HAVE_DECL_ETHTOOL_GFEATURES if (virNetDevGetEthtoolGFeatures(*out, ifname) < 0)
if (VIR_ALLOC_VAR(g_cmd,
struct ethtool_get_features_block, GFEATURES_SIZE) < 0)
return -1; return -1;
g_cmd->cmd = ETHTOOL_GFEATURES;
g_cmd->size = GFEATURES_SIZE;
if (virNetDevGFeatureAvailable(ifname, g_cmd) == 1)
ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_TXUDPTNL));
VIR_FREE(g_cmd);
# endif
if (virNetDevRDMAFeature(ifname, out) < 0) if (virNetDevRDMAFeature(ifname, out) < 0)
return -1; return -1;