[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/16] nbd: don't change socket block during negotia
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 09/16] nbd: don't change socket block during negotiate |
Date: |
Mon, 16 Dec 2013 10:31:10 +0100 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
block/nbd-client.c | 1 +
nbd.c | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
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 nbd_client_session_init(NbdClientSession *client,
int ret;
/* NBD handshake */
+ qemu_set_block(sock);
ret = nbd_receive_negotiate(sock, client->export_name,
&client->nbdflags, &client->size,
&client->blocksize);
diff --git a/nbd.c b/nbd.c
index f847940..030f56b 100644
--- a/nbd.c
+++ b/nbd.c
@@ -443,7 +443,6 @@ int nbd_receive_negotiate(int csock, const char *name,
uint32_t *flags,
TRACE("Receiving negotiation.");
- qemu_set_block(csock);
rc = -EINVAL;
if (read_sync(csock, buf, 8) != 8) {
@@ -558,7 +557,6 @@ int nbd_receive_negotiate(int csock, const char *name,
uint32_t *flags,
rc = 0;
fail:
- qemu_set_nonblock(csock);
return rc;
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/16] spice patch queue, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 02/16] vscclient: do not add a socket watch if there is not data to send, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 01/16] spice: flip streaming video mode to off by default, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 03/16] spice-char: remove unused field, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 10/16] nbd: pass export name as init argument, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 08/16] Split nbd block client code, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 09/16] nbd: don't change socket block during negotiate,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 04/16] qmp_change_blockdev() remove unused has_format, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 16/16] spice: stop server for qxl hard reset, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 11/16] nbd: make nbd_client_session_close() idempotent, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 07/16] spice-char: implement chardev port event, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 05/16] include: add missing config-host.h include, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 12/16] nbd: finish any pending coroutine, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 14/16] spice: move qemu_spice_display_*() from spice-graphics to spice-core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 15/16] spice: move spice_server_vm_{start, stop} calls into qemu_spice_display_*(), Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 13/16] nbd: avoid uninitialized warnings, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 06/16] char: add qemu_chr_fe_event(), Gerd Hoffmann, 2013/12/16