[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/16] nbd: finish any pending coroutine
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 12/16] nbd: finish any pending coroutine |
Date: |
Mon, 16 Dec 2013 10:31:13 +0100 |
From: Marc-André Lureau <address@hidden>
Make sure all pending coroutines are finished when closing the session.
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 | 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.3.1
- [Qemu-devel] [PATCH 01/16] spice: flip streaming video mode to off by default, (continued)
- [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, 2013/12/16
- [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 <=
- [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