From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 4 Jul 2018 07:57:05 +0000 (+0200)
Subject: virCommandWait: Propagate dryRunCallback return value properly
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c1a75828e448eebdfb015a87a11ac220abb7f5ea;p=libvirt.git

virCommandWait: Propagate dryRunCallback return value properly

The documentation to virCommandWait() function states that if
@exitstatus is NULL and command finished with error -1 is
returned. In other words, if @dryRunCallback is set and returns
an error (by setting its @status argument to a nonzero value) we
must propagate this error properly honouring the documentation
(and also regular run).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 8ba9c35635..8be3fdffbc 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -2542,6 +2542,8 @@ virCommandWait(virCommandPtr cmd, int *exitstatus)
                   dryRunStatus);
         if (exitstatus)
             *exitstatus = dryRunStatus;
+        else if (dryRunStatus)
+            return -1;
         return 0;
     }