38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From 03f4080c80170f388f9d902e4f8db3c5d0a6eb10 Mon Sep 17 00:00:00 2001
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Mon, 1 Mar 2021 10:25:18 +0100
|
|
Subject: [PATCH 017/108] virPipeImpl: Don't overwrite error
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
(cherry picked from commit ae87dc3d09cc26aa9b6587e4db73d42529dce69b)
|
|
---
|
|
src/util/virutil.c | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/src/util/virutil.c b/src/util/virutil.c
|
|
index bea9749cae..ada3dae7c6 100644
|
|
--- a/src/util/virutil.c
|
|
+++ b/src/util/virutil.c
|
|
@@ -1759,8 +1759,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;
|
|
--
|
|
2.33.0
|
|
|