From: Laine Stump <laine@laine.org>
Date: Sun, 13 Aug 2017 15:19:27 +0000 (-0400)
Subject: util: fix improper assignment of return value in virHostdevReadNetConfig()
X-Git-Tag: v3.7.0-rc1~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83074cc917615c8c2c9e147cbd6918812330fd0d;p=thirdparty%2Flibvirt.git

util: fix improper assignment of return value in virHostdevReadNetConfig()

Commit 9a94af6d restructured virHostdevReadNetConfig() so that it
would manually set ret = 0 after successfully reading the device's
config, but Coverity pointed out that "ret = 0" was erroneously placed
outside of an "else" clause, meaning that the the value of ret set in
the "if" clause was unnecessarily and incorrectly overwritten.

This patch moves ret = 0 into the else clause, which should silence
Coverity.
---

diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index cca9d81a4c..a12224c58f 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -641,9 +641,9 @@ virHostdevRestoreNetConfig(virDomainHostdevDefPtr hostdev,
 
         ignore_value(virNetDevSetNetConfig(linkdev, vf,
                                            adminMAC, vlan, MAC, true));
+        ret = 0;
     }
 
-    ret = 0;
  cleanup:
     VIR_FREE(linkdev);
     VIR_FREE(MAC);