From e2d2b7d577b653a39a8374b0af41de683a3eb061 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@redhat.com>
Date: Fri, 12 Dec 2008 07:29:39 +0000
Subject: [PATCH] * src/util.c: retry poll() in EINTR failures, patch by Dave
 Allan daniel

---
 ChangeLog  | 4 ++++
 src/util.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 20c926bfe4..5f7b0aacb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Dec 12 08:27:44 CET 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/util.c: retry poll() in EINTR failures, patch by Dave Allan
+
 Thu Dec 11 19:10:46 +0100 2008 Jim Meyering <meyering@redhat.com>
 
 	build: avoid libvirtd link failure with CFLAGS=-g
diff --git a/src/util.c b/src/util.c
index da260096a1..9e6e0868b3 100644
--- a/src/util.c
+++ b/src/util.c
@@ -473,7 +473,7 @@ virPipeReadUntilEOF(virConnectPtr conn, int outfd, int errfd,
     while(!(finished[0] && finished[1])) {
 
         if (poll(fds, ARRAY_CARDINALITY(fds), -1) < 0) {
-            if (errno == EAGAIN)
+            if ((errno == EAGAIN) || (errno == EINTR))
                 continue;
             goto pollerr;
         }