]> xenbits.xensource.com Git - libvirt.git/commitdiff
Fix error reporting in virNetDevVethDelete
authorDaniel P. Berrange <berrange@redhat.com>
Tue, 27 Nov 2012 12:35:49 +0000 (12:35 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Tue, 27 Nov 2012 17:59:28 +0000 (17:59 +0000)
In virNetDevVethDelete the virRun method will properly report
errors, but when checking the exit status for non-zero exit
code no error is reported

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
src/util/virnetdevveth.c

index 7414a14506c9877c43b95e0bfe1bc114c3cd3e7c..4166ee09d7f44543aef088298ac3b368aaaaf6af 100644 (file)
@@ -162,24 +162,9 @@ cleanup:
  */
 int virNetDevVethDelete(const char *veth)
 {
-    int rc;
     const char *argv[] = {"ip", "link", "del", veth, NULL};
-    int cmdResult = 0;
 
     VIR_DEBUG("veth: %s", veth);
 
-    rc = virRun(argv, &cmdResult);
-
-    if (rc != 0 ||
-        (WIFEXITED(cmdResult) && WEXITSTATUS(cmdResult) != 0)) {
-        /*
-         * Prevent overwriting an error log which may be set
-         * where an actual failure occurs.
-         */
-        VIR_DEBUG("Failed to delete '%s' (%d)",
-                  veth, WEXITSTATUS(cmdResult));
-        rc = -1;
-    }
-
-    return rc;
+    return virRun(argv, NULL);
 }