block/nbd: introduce nbd_client_connection_new()

This is a step of creating bs-independent nbd connection interface.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Roman Kagan <rvkagan@yandex-team.ru>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210610100802.5888-16-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-06-10 13:07:45 +03:00 committed by Eric Blake
parent 90ddc64fb2
commit f68729747d
1 changed files with 9 additions and 6 deletions

View File

@ -358,15 +358,18 @@ static bool nbd_client_connecting_wait(BDRVNBDState *s)
return qatomic_load_acquire(&s->state) == NBD_CLIENT_CONNECTING_WAIT;
}
static void nbd_init_connect_thread(BDRVNBDState *s)
static NBDClientConnection *
nbd_client_connection_new(const SocketAddress *saddr)
{
s->conn = g_new(NBDClientConnection, 1);
NBDClientConnection *conn = g_new(NBDClientConnection, 1);
*s->conn = (NBDClientConnection) {
.saddr = QAPI_CLONE(SocketAddress, s->saddr),
*conn = (NBDClientConnection) {
.saddr = QAPI_CLONE(SocketAddress, saddr),
};
qemu_mutex_init(&s->conn->mutex);
qemu_mutex_init(&conn->mutex);
return conn;
}
static void nbd_free_connect_thread(NBDClientConnection *conn)
@ -2230,7 +2233,7 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,
goto fail;
}
nbd_init_connect_thread(s);
s->conn = nbd_client_connection_new(s->saddr);
/*
* establish TCP connection, return error if it fails