The field is actually unused. Let's make things a bit simpler dropping it and corresponding logic.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> --- block/nbd.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index c26dc5a54f..a47d6cfea3 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -122,7 +122,6 @@ typedef struct BDRVNBDState { int in_flight; NBDClientState state; int connect_status; - Error *connect_err; bool wait_in_flight; QEMUTimer *reconnect_delay_timer; @@ -578,7 +577,6 @@ static void nbd_co_establish_connection_cancel(BlockDriverState *bs, static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s) { int ret; - Error *local_err = NULL; if (!nbd_client_connecting(s)) { return; @@ -619,14 +617,14 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s) s->ioc = NULL; } - if (nbd_co_establish_connection(s->bs, &local_err) < 0) { + if (nbd_co_establish_connection(s->bs, NULL) < 0) { ret = -ECONNREFUSED; goto out; } bdrv_dec_in_flight(s->bs); - ret = nbd_client_handshake(s->bs, &local_err); + ret = nbd_client_handshake(s->bs, NULL); if (s->drained) { s->wait_drained_end = true; @@ -642,9 +640,6 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s) out: s->connect_status = ret; - error_free(s->connect_err); - s->connect_err = NULL; - error_propagate(&s->connect_err, local_err); if (ret >= 0) { /* successfully connected */ -- 2.29.2