xenstored: Do not write to stderr if we are daemonised!

This fixes client reader-thread deaths in which a 'garbage string' was
being read instead of a well-formed message header.
Signed-off-by: Keir Fraser <keir@xensource.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/tools/xenstore/utils.c b/tools/xenstore/utils.c
index 45e71efd14..d7f5219a87 100644
--- a/tools/xenstore/utils.c
+++ b/tools/xenstore/utils.c
@@ -8,20 +8,19 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <signal.h>
-
 #include "utils.h"
 
 void xprintf(const char *fmt, ...)
 {
-	static FILE *out = NULL;
 	va_list args;
-	if (!out)
-		out = stderr;
+
+	if (!stderr)
+		return; /* could trace()? */
 
 	va_start(args, fmt);
-	vfprintf(out, fmt, args);
+	vfprintf(stderr, fmt, args);
 	va_end(args);
-	fflush(out);
+	fflush(stderr);
 }
 
 void barf(const char *fmt, ...)