提交 606a0133 编写于 作者: L Laine Stump

util: eliminate useless local variable

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.
上级 19c5db74
/* /*
* Copyright (C) 2010-2016 Red Hat, Inc. * Copyright (C) 2010-2017 Red Hat, Inc.
* Copyright (C) 2010-2012 IBM Corporation * Copyright (C) 2010-2012 IBM Corporation
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
...@@ -1179,14 +1179,13 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, ...@@ -1179,14 +1179,13 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
char *stateDir) char *stateDir)
{ {
int ret = 0; int ret = 0;
int vf = -1;
if (ifname) { if (ifname) {
if (virNetDevVPortProfileDisassociate(ifname, if (virNetDevVPortProfileDisassociate(ifname,
virtPortProfile, virtPortProfile,
macaddr, macaddr,
linkdev, linkdev,
vf, -1,
VIR_NETDEV_VPORT_PROFILE_OP_DESTROY) < 0) VIR_NETDEV_VPORT_PROFILE_OP_DESTROY) < 0)
ret = -1; ret = -1;
if (virNetDevMacVLanDelete(ifname) < 0) if (virNetDevMacVLanDelete(ifname) < 0)
...@@ -1199,7 +1198,7 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, ...@@ -1199,7 +1198,7 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_8021QBH) virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_8021QBH)
ignore_value(virNetDevRestoreMacAddress(linkdev, stateDir)); ignore_value(virNetDevRestoreMacAddress(linkdev, stateDir));
else else
ignore_value(virNetDevRestoreNetConfig(linkdev, vf, stateDir)); ignore_value(virNetDevRestoreNetConfig(linkdev, -1, stateDir));
} }
virNetlinkEventRemoveClient(0, macaddr, NETLINK_ROUTE); virNetlinkEventRemoveClient(0, macaddr, NETLINK_ROUTE);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册