OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

nbd: finish any pending coroutine

Browse Source 
Make sure all pending coroutines are finished when closing the session.

Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.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:45 +01:00 committed by Gerd Hoffmann
parent 5ad283ebb8
commit 69152c09d3
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
block/nbd-client.c
View File

@ -32,6 +32,17 @@
#define HANDLE_TO_INDEX(bs, handle) ((handle) ^ ((uint64_t)(intptr_t)bs)) #define HANDLE_TO_INDEX(bs, handle) ((handle) ^ ((uint64_t)(intptr_t)bs))
#define INDEX_TO_HANDLE(bs, index) ((index) ^ ((uint64_t)(intptr_t)bs)) #define INDEX_TO_HANDLE(bs, index) ((index) ^ ((uint64_t)(intptr_t)bs))
static void nbd_recv_coroutines_enter_all(NbdClientSession *s)
{
int i;
for (i = 0; i < MAX_NBD_REQUESTS; i++) {
if (s->recv_coroutine[i]) {
qemu_coroutine_enter(s->recv_coroutine[i], NULL);
}
}
}
static void nbd_reply_ready(void *opaque) static void nbd_reply_ready(void *opaque)
{ {
NbdClientSession *s = opaque; NbdClientSession *s = opaque;
@ -67,11 +78,7 @@ static void nbd_reply_ready(void *opaque)
} }
fail: fail:
for (i = 0; i < MAX_NBD_REQUESTS; i++) { nbd_recv_coroutines_enter_all(s);
if (s->recv_coroutine[i]) {
qemu_coroutine_enter(s->recv_coroutine[i], NULL);
}
}
} }
static void nbd_restart_write(void *opaque) static void nbd_restart_write(void *opaque)
@ -330,6 +337,10 @@ static void nbd_teardown_connection(NbdClientSession *client)
request.len = 0; request.len = 0;
nbd_send_request(client->sock, &request); nbd_send_request(client->sock, &request);
/* finish any pending coroutines */
shutdown(client->sock, 2);
nbd_recv_coroutines_enter_all(client);
qemu_aio_set_fd_handler(client->sock, NULL, NULL, NULL); qemu_aio_set_fd_handler(client->sock, NULL, NULL, NULL);
closesocket(client->sock); closesocket(client->sock);
client->sock = -1; client->sock = -1;