diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2021-06-10 13:07:54 +0300 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2021-06-18 10:59:54 -0500 |
| commit | c2405af0e418a3f4cca0840f31161f7ac17b9697 (patch) | |
| tree | f61312c219ac1c2ef9e6293bdd89cd01e6c4f53b | |
| parent | 6d2b0332d3a2d85bb37786a914c6865a4386ef87 (diff) | |
| download | qemu-c2405af0e418a3f4cca0840f31161f7ac17b9697.zip qemu-c2405af0e418a3f4cca0840f31161f7ac17b9697.tar.gz qemu-c2405af0e418a3f4cca0840f31161f7ac17b9697.tar.bz2 | |
block/nbd: don't touch s->sioc in nbd_teardown_connection()
Negotiation during reconnect is now done in a thread, and s->sioc is
not available during negotiation. Negotiation in thread will be
cancelled by nbd_client_connection_release() called from
nbd_clear_bdrvstate(). So, we don't need this code chunk anymore.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210610100802.5888-25-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | block/nbd.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/block/nbd.c b/block/nbd.c index 3114716..2abcedd 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -280,10 +280,6 @@ static void nbd_teardown_connection(BlockDriverState *bs) if (s->ioc) { /* finish any pending coroutines */ qio_channel_shutdown(s->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL); - } else if (s->sioc) { - /* abort negotiation */ - qio_channel_shutdown(QIO_CHANNEL(s->sioc), QIO_CHANNEL_SHUTDOWN_BOTH, - NULL); } s->state = NBD_CLIENT_QUIT; |