]> xenbits.xensource.com Git - libvirt.git/commitdiff
Don't return a fatal error if receiving unexpected stream data
authorDaniel P. Berrange <berrange@redhat.com>
Wed, 9 Nov 2011 13:54:01 +0000 (13:54 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Wed, 16 Nov 2011 11:22:39 +0000 (11:22 +0000)
Due to the asynchronous nature of streams, we might continue to
receive some stream packets from the server even after we have
shutdown the stream on the client side. These should be discarded
silently, rather than raising an error in the RPC layer.

* src/rpc/virnetclient.c: Discard stream data silently

src/rpc/virnetclient.c

index 62bb2d83fda2779ddce6acdbcb43f972bf1a5b4d..deeeaadfaecc1ec2bf98e9436aaab14d878272ce 100644 (file)
@@ -722,7 +722,9 @@ static int virNetClientCallDispatchStream(virNetClientPtr client)
         VIR_DEBUG("No stream found for packet with prog=%d vers=%d serial=%u proc=%u",
                   client->msg.header.prog, client->msg.header.vers,
                   client->msg.header.serial, client->msg.header.proc);
-        return -1;
+        /* Don't return -1, because we expect to see further stream packets
+         * after we've shut it down sometimes */
+        return 0;
     }
 
     /* Finish/Abort are synchronous, so also see if there's an