[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 03/10] block/nbd-client: split connection from in
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH v4 03/10] block/nbd-client: split connection from initialization |
Date: |
Tue, 31 Jul 2018 20:30:26 +0300 |
Split connection code to reuse it for reconnect.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/nbd-client.c | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/block/nbd-client.c b/block/nbd-client.c
index a0d8f2523e..a1813cbfe1 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -999,13 +999,13 @@ static QIOChannelSocket
*nbd_establish_connection(SocketAddress *saddr,
return sioc;
}
-int nbd_client_init(BlockDriverState *bs,
- SocketAddress *saddr,
- const char *export,
- QCryptoTLSCreds *tlscreds,
- const char *hostname,
- const char *x_dirty_bitmap,
- Error **errp)
+static int nbd_client_connect(BlockDriverState *bs,
+ SocketAddress *saddr,
+ const char *export,
+ QCryptoTLSCreds *tlscreds,
+ const char *hostname,
+ const char *x_dirty_bitmap,
+ Error **errp)
{
NBDClientSession *client = nbd_get_client_session(bs);
int ret;
@@ -1051,8 +1051,6 @@ int nbd_client_init(BlockDriverState *bs,
bs->supported_zero_flags |= BDRV_REQ_MAY_UNMAP;
}
- qemu_co_mutex_init(&client->send_mutex);
- qemu_co_queue_init(&client->free_sema);
client->sioc = sioc;
if (!client->ioc) {
@@ -1069,3 +1067,20 @@ int nbd_client_init(BlockDriverState *bs,
logout("Established connection with NBD server\n");
return 0;
}
+
+int nbd_client_init(BlockDriverState *bs,
+ SocketAddress *saddr,
+ const char *export,
+ QCryptoTLSCreds *tlscreds,
+ const char *hostname,
+ const char *x_dirty_bitmap,
+ Error **errp)
+{
+ NBDClientSession *client = nbd_get_client_session(bs);
+
+ qemu_co_mutex_init(&client->send_mutex);
+ qemu_co_queue_init(&client->free_sema);
+
+ return nbd_client_connect(bs, saddr, export, tlscreds, hostname,
+ x_dirty_bitmap, errp);
+}
--
2.11.1
- [Qemu-devel] [PATCH v4 00/10] NBD reconnect, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 05/10] block/nbd-client: don't check ioc, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 08/10] block/nbd: add cmdline and qapi parameter reconnect-delay, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 01/10] block/nbd-client: split channel errors from export errors, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 07/10] block/nbd-client: rename read_reply_co to connection_co, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 06/10] block/nbd-client: move from quit to state, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 09/10] block/nbd-client: nbd reconnect, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 03/10] block/nbd-client: split connection from initialization,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH v4 04/10] block/nbd-client: fix nbd_reply_chunk_iter_receive, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 02/10] block/nbd: move connection code from block/nbd to block/nbd-client, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 10/10] iotests: test nbd reconnect, Vladimir Sementsov-Ogievskiy, 2018/07/31