openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Marc-André Lureau 2013-12-01 22:23:42 +01:00 committed by Gerd Hoffmann
parent 2302c1cafb
commit e53a18e488
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
block/nbd-client.c
View File

@ -348,6 +348,7 @@ int nbd_client_session_init(NbdClientSession *client,
int ret; int ret;
/* NBD handshake */ /* NBD handshake */
qemu_set_block(sock);
ret = nbd_receive_negotiate(sock, client->export_name, ret = nbd_receive_negotiate(sock, client->export_name,
&client->nbdflags, &client->size, &client->nbdflags, &client->size,
&client->blocksize); &client->blocksize);

2
nbd.c
View File

@ -443,7 +443,6 @@ int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags,
TRACE("Receiving negotiation."); TRACE("Receiving negotiation.");
qemu_set_block(csock);
rc = -EINVAL; rc = -EINVAL;
if (read_sync(csock, buf, 8) != 8) { 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; rc = 0;
fail: fail:
qemu_set_nonblock(csock);
return rc; return rc;
} }