From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 30 May 2012 12:17:26 +0000 (+0200)
Subject: virCommand: Extend debug message for handshake
X-Git-Tag: v0.9.11.4~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3f0d2ecba0dffc21bcbbade7cdf07b3b545947a;p=thirdparty%2Flibvirt.git

virCommand: Extend debug message for handshake

Currently, we are logging only one side of pipes we
create in virCommandRequireHandshake(); This is enough
in cases where pipe2() returns two consecutive FDs. However,
it is not guaranteed and it may return any FDs.
Therefore, it's wise to log the other ends as well.
(cherry picked from commit 7454849ec5489c7b52d3b41a8022f2bc6fda9eee)
---

diff --git a/src/util/command.c b/src/util/command.c
index eaa9f16753..5b94f1e36d 100644
--- a/src/util/command.c
+++ b/src/util/command.c
@@ -2443,8 +2443,10 @@ void virCommandRequireHandshake(virCommandPtr cmd)
         return;
     }
 
-    VIR_DEBUG("Transfer handshake wait=%d notify=%d",
-              cmd->handshakeWait[1], cmd->handshakeNotify[0]);
+    VIR_DEBUG("Transfer handshake wait=%d notify=%d, "
+              "keep handshake wait=%d notify=%d",
+              cmd->handshakeWait[1], cmd->handshakeNotify[0],
+              cmd->handshakeWait[0], cmd->handshakeNotify[1]);
     virCommandTransferFD(cmd, cmd->handshakeWait[1]);
     virCommandTransferFD(cmd, cmd->handshakeNotify[0]);
     cmd->handshake = true;