From: Andrea Bolognani <abologna@redhat.com>
Date: Wed, 20 Feb 2019 13:16:46 +0000 (+0100)
Subject: util: Move error reporting back to virFileWrapperFdClose()
X-Git-Tag: v5.1.0-rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4640131ba39e549ae9b5a794efe0c259408626c6;p=thirdparty%2Flibvirt.git

util: Move error reporting back to virFileWrapperFdClose()

virFileWrapperFdFree(), like all free functions, is supposed
to only release allocated resources, so error reporting is
better suited for virFileWrapperFdClose().

This reverts commit b0c3e931804a86cd7146db0164ab4843039c410b.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/util/virfile.c b/src/util/virfile.c
index 42add5a2cd..d35206b0dd 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -337,6 +337,9 @@ virFileWrapperFdClose(virFileWrapperFdPtr wfd)
 
     ret = virCommandWait(wfd->cmd, NULL);
 
+    if (wfd->err_msg && *wfd->err_msg)
+        VIR_WARN("iohelper reports: %s", wfd->err_msg);
+
     wfd->closed = true;
 
     return ret;
@@ -357,11 +360,6 @@ virFileWrapperFdFree(virFileWrapperFdPtr wfd)
     if (!wfd)
         return;
 
-    if (wfd->err_msg && *wfd->err_msg)
-        VIR_WARN("iohelper reports: %s", wfd->err_msg);
-
-    virCommandAbort(wfd->cmd);
-
     VIR_FREE(wfd->err_msg);
     virCommandFree(wfd->cmd);
     VIR_FREE(wfd);