From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 1 Mar 2021 09:25:18 +0000 (+0100)
Subject: virPipeImpl: Don't overwrite error
X-Git-Tag: v7.2.0-rc1~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae87dc3d09cc26aa9b6587e4db73d42529dce69b;p=thirdparty%2Flibvirt.git

virPipeImpl: Don't overwrite error

If WITH_PIPE2 is not defined we attempt to set the pipe to nonblocking
operation after they are created. We errorneously rewrote the existing
error message on failure to do so or even reported an error if quiet
mode was requested.

Fixes: ab36f729470c313b9d5b7debdbeac441f7780dec
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/util/virutil.c b/src/util/virutil.c
index a0cd0f1bcd..0f3cf98613 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -1924,8 +1924,6 @@ virPipeImpl(int fds[2], bool nonblock, bool errreport)
             if (errreport)
                 virReportSystemError(errno, "%s",
                                      _("Unable to set pipes to non-blocking"));
-            virReportSystemError(errno, "%s",
-                                 _("Unable to create pipes"));
             VIR_FORCE_CLOSE(fds[0]);
             VIR_FORCE_CLOSE(fds[1]);
             return -1;