[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv2 12/14] nbd: finish any pending coroutine
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCHv2 12/14] nbd: finish any pending coroutine |
Date: |
Sun, 1 Dec 2013 22:23:45 +0100 |
Make sure all pending coroutines are finished when closing the session.
Signed-off-by: Marc-André Lureau <address@hidden>
---
block/nbd-client.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/block/nbd-client.c b/block/nbd-client.c
index 9156093..1973cf0 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -32,6 +32,17 @@
#define HANDLE_TO_INDEX(bs, handle) ((handle) ^ ((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)
{
NbdClientSession *s = opaque;
@@ -67,11 +78,7 @@ static void nbd_reply_ready(void *opaque)
}
fail:
- for (i = 0; i < MAX_NBD_REQUESTS; i++) {
- if (s->recv_coroutine[i]) {
- qemu_coroutine_enter(s->recv_coroutine[i], NULL);
- }
- }
+ nbd_recv_coroutines_enter_all(s);
}
static void nbd_restart_write(void *opaque)
@@ -330,6 +337,10 @@ static void nbd_teardown_connection(NbdClientSession
*client)
request.len = 0;
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);
closesocket(client->sock);
client->sock = -1;
--
1.8.4.2
- [Qemu-devel] [PATCHv2 02/14] vscclient: do not add a socket watch if there is not data to send, (continued)
- [Qemu-devel] [PATCHv2 02/14] vscclient: do not add a socket watch if there is not data to send, Marc-André Lureau, 2013/12/01
- [Qemu-devel] [PATCHv2 03/14] spice-char: remove unused field, Marc-André Lureau, 2013/12/01
- [Qemu-devel] [PATCHv2 04/14] qmp_change_blockdev() remove unused has_format, Marc-André Lureau, 2013/12/01
- [Qemu-devel] [PATCHv2 05/14] include: add missing config-host.h include, Marc-André Lureau, 2013/12/01
- [Qemu-devel] [PATCHv2 06/14] char: add qemu_chr_fe_event(), Marc-André Lureau, 2013/12/01
- [Qemu-devel] [PATCHv2 08/14] Split nbd block client code, Marc-André Lureau, 2013/12/01
- [Qemu-devel] [PATCHv2 07/14] spice-char: implement chardev port event, Marc-André Lureau, 2013/12/01
- [Qemu-devel] [PATCHv2 09/14] nbd: don't change socket block during negotiate, Marc-André Lureau, 2013/12/01
- [Qemu-devel] [PATCHv2 10/14] nbd: pass export name as init argument, Marc-André Lureau, 2013/12/01
- [Qemu-devel] [PATCHv2 11/14] nbd: make nbd_client_session_close() idempotent, Marc-André Lureau, 2013/12/01
- [Qemu-devel] [PATCHv2 12/14] nbd: finish any pending coroutine,
Marc-André Lureau <=
- [Qemu-devel] [PATCHv2 13/14] nbd: avoid uninitialized warnings, Marc-André Lureau, 2013/12/01
- [Qemu-devel] [PATCHv2 14/14] coroutine: remove unused CoQueue AioContext, Marc-André Lureau, 2013/12/01
- Re: [Qemu-devel] [PATCHv2 00/14] Spice block device, ready-to-go patches, Gerd Hoffmann, 2013/12/02
- Re: [Qemu-devel] [PATCHv2 00/14] Spice block device, ready-to-go patches, Stefan Hajnoczi, 2013/12/02