From 16c6e2b41eb39b14693c0d6e2010786cabf0c729 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Mon, 27 Jun 2011 21:38:00 +0100
Subject: [PATCH] Fix propagation of RPC errors from streams

If a streams error is raised, virNetClientIOEventLoop
returns 0, but an error is set. Check for this and
propagate it if present

* src/rpc/virnetclient.c: Propagate streams error
---
 src/rpc/virnetclient.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index ded1e12615..dc0ce5107b 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -1090,10 +1090,15 @@ static int virNetClientIO(virNetClientPtr client,
      */
     virNetSocketUpdateIOCallback(client->sock, 0);
 
+    virResetLastError();
     rv = virNetClientIOEventLoop(client, thiscall);
 
     virNetSocketUpdateIOCallback(client->sock, VIR_EVENT_HANDLE_READABLE);
 
+    if (rv == 0 &&
+        virGetLastError())
+        rv = -1;
+
 cleanup:
     VIR_DEBUG("All done with our call %p %p %d", client->waitDispatch, thiscall, rv);
     return rv;