External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: eliminate useless local variable

Browse Source 
vf in virNetDevMacVLanDeleteWithVPortProfile() is initialized to -1
and never set. It's not set for a good reason - because it doesn't
make sense during macvtap device setup to refer to a VF device as
"PF:VF#". This patch replaces the two uses of "vf" with "-1", and
removes the local variable, so that it's more clear we are always
calling the utility functions with vf set to -1.
This commit is contained in:
Laine Stump 2017-03-05 17:32:15 -05:00
parent 19c5db749c
commit 606a013395
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/util/virnetdevmacvlan.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2016 Red Hat, Inc.
* Copyright (C) 2010-2017 Red Hat, Inc.
* Copyright (C) 2010-2012 IBM Corporation
*
* This library is free software; you can redistribute it and/or
@ -1179,14 +1179,13 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
char *stateDir)
{
int ret = 0;
int vf = -1;
if (ifname) {
if (virNetDevVPortProfileDisassociate(ifname,
virtPortProfile,
macaddr,
linkdev,
vf,
-1,
VIR_NETDEV_VPORT_PROFILE_OP_DESTROY) < 0)
ret = -1;
if (virNetDevMacVLanDelete(ifname) < 0)
@ -1199,7 +1198,7 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_8021QBH)
ignore_value(virNetDevRestoreMacAddress(linkdev, stateDir));
else
ignore_value(virNetDevRestoreNetConfig(linkdev, vf, stateDir));
ignore_value(virNetDevRestoreNetConfig(linkdev, -1, stateDir));
}
virNetlinkEventRemoveClient(0, macaddr, NETLINK_ROUTE);