commit 840042901710c2dc1a3ac3e5af9bed449c339701
author MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp> Tue Jul 23 17:30:12 2013 +0900
committer Kevin Wolf <kwolf@redhat.com> Tue Aug 06 10:41:56 2013 +0200
tree 82f2c1a653089c02ff7945b2cca4ba868e1549a5
parent 526eda14a68d5b3596be715505289b541288ef2a

iov: handle EOF in iov_send_recv

Without this patch, iov_send_recv() never returns when do_send_recv()
returns zero.

Signed-off-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

util/iov.c

diff --git a/util/iov.c b/util/iov.c
index cc6e837..f705586 100644
--- a/util/iov.c
+++ b/util/iov.c
@@ -202,6 +202,12 @@
             return -1;
         }
 
+        if (ret == 0 && !do_send) {
+            /* recv returns 0 when the peer has performed an orderly
+             * shutdown. */
+            break;
+        }
+
         /* Prepare for the next iteration */
         offset += ret;
         total += ret;