From: Laine Stump <laine@laine.org>
Date: Sun, 5 Mar 2017 22:32:15 +0000 (-0500)
Subject: util: eliminate useless local variable
X-Git-Tag: v3.2.0-rc1~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=606a01339563b5371f21a9b2c10ef818c0557fb1;p=thirdparty%2Flibvirt.git

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.
---

diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index b106ca155c..be9dff6184 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -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);