commit e53a18e488c657bbc6f218ae60de8e813a912667
author Marc-André Lureau <marcandre.lureau@redhat.com> Sun Dec 01 22:23:42 2013 +0100
committer Gerd Hoffmann <kraxel@redhat.com> Mon Dec 16 10:12:20 2013 +0100
tree a34d0514b9d7530e894177ebc4e6df3aec1262a2
parent 2302c1cafb13df23938b098d9c6595de52ec2577

nbd: don't change socket block during negotiate

The caller might handle non-blocking using coroutine. Leave the choice
to the caller to use a blocking or non-blocking negotiate.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

block/nbd-client.c

diff --git a/block/nbd-client.c b/block/nbd-client.c
index 1abfc6a..693110d 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -348,6 +348,7 @@
     int ret;
 
     /* NBD handshake */
+    qemu_set_block(sock);
     ret = nbd_receive_negotiate(sock, client->export_name,
                                 &client->nbdflags, &client->size,
                                 &client->blocksize);

nbd.c

diff --git a/nbd.c b/nbd.c
index f847940..030f56b 100644
--- a/nbd.c
+++ b/nbd.c
@@ -443,7 +443,6 @@
 
     TRACE("Receiving negotiation.");
 
-    qemu_set_block(csock);
     rc = -EINVAL;
 
     if (read_sync(csock, buf, 8) != 8) {
@@ -558,7 +557,6 @@
     rc = 0;
 
 fail:
-    qemu_set_nonblock(csock);
     return rc;
 }