External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return bool in virNetDevFeatureAvailable

Browse Source 
Simplify the logic
This commit is contained in:
Ján Tomko 2016-06-03 20:44:23 +02:00
parent 3a7440bdc7
commit d59ca0b05f
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/util/virnetdev.c
View File

@ -3252,17 +3252,16 @@ struct virNetDevEthtoolFeatureCmd {
* @ifname: name of the interface * @ifname: name of the interface
* @cmd: reference to an ethtool command structure * @cmd: reference to an ethtool command structure
* *
* Returns 0 if not found, 1 on success, and -1 on failure. * Returns true if the feature is available, false otherwise.
*/ */
static int static bool
virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd)
{ {
int ret = -1;
cmd = (void*)cmd; cmd = (void*)cmd;
if (!virNetDevSendEthtoolIoctl(ifname, cmd)) if (virNetDevSendEthtoolIoctl(ifname, cmd) == 0 &&
ret = cmd->data > 0 ? 1 : 0; cmd->data > 0)
return ret; return true;
return false;
} }
@ -3308,13 +3307,13 @@ virNetDevGetEthtoolFeatures(virBitmapPtr bitmap,
for (i = 0; i < ARRAY_CARDINALITY(ethtool_cmds); i++) { for (i = 0; i < ARRAY_CARDINALITY(ethtool_cmds); i++) {
cmd.cmd = ethtool_cmds[i].cmd; cmd.cmd = ethtool_cmds[i].cmd;
if (virNetDevFeatureAvailable(ifname, &cmd) == 1) if (virNetDevFeatureAvailable(ifname, &cmd))
ignore_value(virBitmapSetBit(bitmap, ethtool_cmds[i].feat)); ignore_value(virBitmapSetBit(bitmap, ethtool_cmds[i].feat));
} }
# if HAVE_DECL_ETHTOOL_GFLAGS # if HAVE_DECL_ETHTOOL_GFLAGS
cmd.cmd = ETHTOOL_GFLAGS; cmd.cmd = ETHTOOL_GFLAGS;
if (virNetDevFeatureAvailable(ifname, &cmd) == 1) { if (virNetDevFeatureAvailable(ifname, &cmd)) {
for (i = 0; i < ARRAY_CARDINALITY(flags); i++) { for (i = 0; i < ARRAY_CARDINALITY(flags); i++) {
if (cmd.data & flags[i].cmd) if (cmd.data & flags[i].cmd)
ignore_value(virBitmapSetBit(bitmap, flags[i].feat)); ignore_value(virBitmapSetBit(bitmap, flags[i].feat));
@ -3332,17 +3331,15 @@ virNetDevGetEthtoolFeatures(virBitmapPtr bitmap,
* @ifname: name of the interface * @ifname: name of the interface
* @cmd: reference to a gfeatures ethtool command structure * @cmd: reference to a gfeatures ethtool command structure
* *
* Returns 0 if not found, 1 on success, and -1 on failure. * Returns true if the feature is available, false otherwise.
*/ */
static int static bool
virNetDevGFeatureAvailable(const char *ifname, struct ethtool_gfeatures *cmd) virNetDevGFeatureAvailable(const char *ifname, struct ethtool_gfeatures *cmd)
{ {
int ret = -1;
cmd = (void*)cmd; cmd = (void*)cmd;
if (!virNetDevSendEthtoolIoctl(ifname, cmd)) if (virNetDevSendEthtoolIoctl(ifname, cmd) == 0)
ret = FEATURE_BIT_IS_SET(cmd->features, TX_UDP_TNL, active); return !!FEATURE_BIT_IS_SET(cmd->features, TX_UDP_TNL, active);
return ret; return false;
} }
@ -3358,7 +3355,7 @@ virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap,
g_cmd->cmd = ETHTOOL_GFEATURES; g_cmd->cmd = ETHTOOL_GFEATURES;
g_cmd->size = GFEATURES_SIZE; g_cmd->size = GFEATURES_SIZE;
if (virNetDevGFeatureAvailable(ifname, g_cmd) == 1) if (virNetDevGFeatureAvailable(ifname, g_cmd))
ignore_value(virBitmapSetBit(bitmap, VIR_NET_DEV_FEAT_TXUDPTNL)); ignore_value(virBitmapSetBit(bitmap, VIR_NET_DEV_FEAT_TXUDPTNL));
VIR_FREE(g_cmd); VIR_FREE(g_cmd);
return 0; return 0;