diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2021-06-10 13:07:39 +0300 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2021-06-18 10:59:53 -0500 |
| commit | 2def3edb4bdc6913c83b14beb0140c395e68ac17 (patch) | |
| tree | f69f12abf50552d5e477136850da4ba228a5a0ae /block | |
| parent | 2a25def4be09714c543713f111813b521b2356ee (diff) | |
| download | qemu-2def3edb4bdc6913c83b14beb0140c395e68ac17.zip qemu-2def3edb4bdc6913c83b14beb0140c395e68ac17.tar.gz qemu-2def3edb4bdc6913c83b14beb0140c395e68ac17.tar.bz2 | |
block/nbd: BDRVNBDState: drop unused connect_err and connect_status
These fields are write-only. Drop them.
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-10-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/nbd.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/block/nbd.c b/block/nbd.c index 77b85ca..fdfb1ff 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -121,8 +121,6 @@ typedef struct BDRVNBDState { bool wait_drained_end; int in_flight; NBDClientState state; - int connect_status; - Error *connect_err; bool wait_in_flight; QEMUTimer *reconnect_delay_timer; @@ -578,7 +576,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 +616,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; @@ -641,11 +638,6 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s) bdrv_inc_in_flight(s->bs); 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 */ s->state = NBD_CLIENT_CONNECTED; |