From nobody Mon Feb 9 11:07:22 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1590421855; cv=none; d=zohomail.com; s=zohoarc; b=jzfVRfatcEf/lgAuXEwFoP+b3B15fNxn7WwzNB4NwpMhfKzUUh5agEaeduNiTZQJrueXsb28uupwl2CB/BhX2tjaWIeP1szPkeGXFrjVXqSHc+2Oo4lMkWVx+PcurQTQ+c5bCs91r1UOotDhtBRClqSgEhSAZGGTLt9GvVZVPDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590421855; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z0dxsnRgRokFAOj2Gk44l8bhweEy9y4U9oO6VVqcKSk=; b=TGfDlldKwH/mSYUwjij9SrSERCZt4dKi3bYONNgJxpVKeJV3tjVPwwQWMa2vw2Ua083bGsXulsgkjXziCRNM+Nk9SlveRHptBG3PxCweLjQxvvyBLzxsnp7zmtpFgX7SK/vXKywgklGfP51wmIpaNiHJ08dwPiKIPoX4PpKSmvM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590421855886788.803482749083; Mon, 25 May 2020 08:50:55 -0700 (PDT) Received: from localhost ([::1]:41470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdFNN-0007e9-S0 for importer@patchew.org; Mon, 25 May 2020 11:50:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdFHI-000528-5B; Mon, 25 May 2020 11:44:36 -0400 Received: from mout.web.de ([217.72.192.78]:58053) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdFHF-0006cz-G3; Mon, 25 May 2020 11:44:35 -0400 Received: from luklap ([94.134.180.22]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Lh6UN-1jHMKK3Z9L-00oSok; Mon, 25 May 2020 17:44:27 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1590421468; bh=Spsqn3Js/ye6hJIlQ74t30HGMoZTUOMLYkK7TW3O+Ts=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=oGagybgkmWIrm6ZvEx3uNFB1+oBoVlMk6xQjLrhoaMNctKC4Sc9iF4V/cpQ6cDQOc 4SMvPqNaFFqAJrLyuIgg1uMG6ANDiSxw0cakVwHX4sRV1PIaYriaEUktcY4nPneEPE UXj372++1lvmI9OUPV1MAy2mUylm/682X+iGxP8k= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Mon, 25 May 2020 17:44:26 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v4 2/4] block/nbd.c: Add yank feature Message-ID: <8e6a8e61b25813cdcdf385729709ef57f6255a3e.1590421341.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Xn/AFqeuw58QJXwKLsHlj6C"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:8ftyGAC81UCENtArw0+NmGCucdlXNKbSK0Ix6YQv0ruNDvkgJfi MzxPkpv2n0SFayTwwJKTJXgoOsRcd2Ge0fLgOtMozxPW1V1bJfuKhi/7qiYqXFlggZ2MZNG x16JgjZyvECxQH9WEVCoJK/xmvdaei4HbjdlTZMbTOFKW4jx4nm349fvHaZPZe5ZC+0xjXK uODzkTbYou6kBAhG677GA== X-UI-Out-Filterresults: notjunk:1;V03:K0:AQw4J5+grJg=:BwUBaR+uQF7Q/XGRuZK8NH wHAhDsFGfUSW/WPn212WtJ0f0JFNoh5hsxkkDbcjNBdiVuOALhHwXS79xw8u/3lpLitkZStRV Fpc9eZF19eEYgVOOted+jUYxuMgQKy027XYGL8GOzS9bOZnF9GJn4kC6sJVtKHfa+ujDpOkz8 bO3mhLBfLfvqai+ztU7vcpTtQPJS+Ob8c+vN0xvMyUV4SHLvUTi6OMyScSJQ+UgBFpZ7FjUnK aBFHxErG6EPrxxXQRzDpNztdQotOV+h+F7SSvYsaybuzQDuhSUaUbIvYbS5Iz8DlHPY8j6Aw5 vxZdkJc+7dsW/lOCoClmGZxIK6Jin7C+2O+OylrsvJznIp4EXDXhYeu4u1CpOSAu0LAJh2O/a /SN7uMpYd/jUeh7hoYOrUrfEP8rOHJtRfFKfTSC1+puTkIQ4sU0XGNp/qzUWQrSdb+g9jaZE0 0x3ilY9eIih3kvfMzM+W7IvE2HwOsG0w5b/Iakv9tXxY0zqOI1S58P6cJshuEPk9xECVQ0M+Q k+4xaVu3u8UKjL+sXMH51maGoHVZo8LtfI9MAMbefnCw59ux0v58jQYKsHzKhBqztfMV8Unbp 1uOc7KCicjqprxtc0XfgfRLMmKa8phxfQiykoE48jANx03XLDGiQiUk8hFJqSOzazfciAHV5s QxeaPHpsZUmNF3AAtgYomo6/lu5pDTpQPKYpzAW0/VjMeeYfBaAziIgEq6rbfgXdbN3AOrl0E Ji0aD+XtxZGKF1GC9VqqmxW0T8S7Ks7KohMqab/z8ful20bS8i7XrWODvMCUjngjiFayx4ut2 68BbkBeG+OoMnvRBzIfPDVeYpW8xpWa7bEx7Eb5pH75hB1oSyzYaMmPIapftj39sXbwLBu1Sp A5/bTVAo5SVfWKVxBynCUxI1xJ9/3K5M79Tqv+6yPM73LMfdAOcFrsV28hvEoqBvrcsXQVqaC i3eudIwuCsd+GBa+45u3z4AUgA7NZEtwpVllRzvYCEPhx7EjPcA5fAcB4St1D+dAHiFagMi7k MSWc4KIunZNLudmKutI28zNJn2ht4+IEaNuW7cN9T11kbbAS9X9AFa9kSNJ3sdThmQe4MHLpU L9wXk+jhM1sO7IJVIgCPS7MZ9Dtdl+JCGrxRfuSJbCa6++SK+npcU8wJfia9ieIZ5RuiZlIpy Oy94VtgCGQqchqEGT6LUXsopcsXyLvoGV2fnKhnIebMlIdGH6C8kOiHJnt0Q9bPd7z5BijqFf 35n8UPe4LahIcHNwi Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=217.72.192.78; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/25 11:44:31 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Daniel P. =?UTF-8?B?QmVycmFuZ8Op?=" , qemu-block , Juan Quintela , "Dr. David Alan Gilbert" , Max Reitz , Paolo Bonzini , =?UTF-8?B?TWFyYy1BbmRy?= =?UTF-8?B?w6k=?= Lureau Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) --Sig_/Xn/AFqeuw58QJXwKLsHlj6C Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Register a yank function which shuts down the socket and sets s->state =3D NBD_CLIENT_QUIT. This is the same behaviour as if an error occured. Signed-off-by: Lukas Straub Reviewed-by: Daniel P. Berrang=C3=A9 --- Makefile.objs | 1 + block/nbd.c | 101 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 65 insertions(+), 37 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index a7c967633a..8e403b81f3 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -18,6 +18,7 @@ block-obj-y +=3D block.o blockjob.o job.o block-obj-y +=3D block/ scsi/ block-obj-y +=3D qemu-io-cmds.o block-obj-$(CONFIG_REPLICATION) +=3D replication.o +block-obj-y +=3D yank.o block-obj-m =3D block/ diff --git a/block/nbd.c b/block/nbd.c index 2160859f64..3a41749f1b 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -35,6 +35,7 @@ #include "qemu/option.h" #include "qemu/cutils.h" #include "qemu/main-loop.h" +#include "qemu/atomic.h" #include "qapi/qapi-visit-sockets.h" #include "qapi/qmp/qstring.h" @@ -43,6 +44,8 @@ #include "block/nbd.h" #include "block/block_int.h" +#include "yank.h" + #define EN_OPTSTR ":exportname=3D" #define MAX_NBD_REQUESTS 16 @@ -84,6 +87,8 @@ typedef struct BDRVNBDState { NBDReply reply; BlockDriverState *bs; + char *yank_name; + /* Connection parameters */ uint32_t reconnect_delay; SocketAddress *saddr; @@ -94,6 +99,7 @@ typedef struct BDRVNBDState { } BDRVNBDState; static int nbd_client_connect(BlockDriverState *bs, Error **errp); +static void nbd_yank(void *opaque); static void nbd_clear_bdrvstate(BDRVNBDState *s) { @@ -106,17 +112,19 @@ static void nbd_clear_bdrvstate(BDRVNBDState *s) s->tlscredsid =3D NULL; g_free(s->x_dirty_bitmap); s->x_dirty_bitmap =3D NULL; + g_free(s->yank_name); + s->yank_name =3D NULL; } static void nbd_channel_error(BDRVNBDState *s, int ret) { if (ret =3D=3D -EIO) { - if (s->state =3D=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTED) { s->state =3D s->reconnect_delay ? NBD_CLIENT_CONNECTING_WAIT : NBD_CLIENT_CONNECTING_NOWAIT; } } else { - if (s->state =3D=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTED) { qio_channel_shutdown(s->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL); } s->state =3D NBD_CLIENT_QUIT; @@ -167,7 +175,7 @@ static void nbd_client_attach_aio_context(BlockDriverSt= ate *bs, * s->connection_co is either yielded from nbd_receive_reply or from * nbd_co_reconnect_loop() */ - if (s->state =3D=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTED) { qio_channel_attach_aio_context(QIO_CHANNEL(s->ioc), new_context); } @@ -206,7 +214,7 @@ static void nbd_teardown_connection(BlockDriverState *b= s) { BDRVNBDState *s =3D (BDRVNBDState *)bs->opaque; - if (s->state =3D=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTED) { /* finish any pending coroutines */ assert(s->ioc); qio_channel_shutdown(s->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL); @@ -230,13 +238,14 @@ static void nbd_teardown_connection(BlockDriverState = *bs) static bool nbd_client_connecting(BDRVNBDState *s) { - return s->state =3D=3D NBD_CLIENT_CONNECTING_WAIT || - s->state =3D=3D NBD_CLIENT_CONNECTING_NOWAIT; + NBDClientState state =3D atomic_read(&s->state); + return state =3D=3D NBD_CLIENT_CONNECTING_WAIT || + state =3D=3D NBD_CLIENT_CONNECTING_NOWAIT; } static bool nbd_client_connecting_wait(BDRVNBDState *s) { - return s->state =3D=3D NBD_CLIENT_CONNECTING_WAIT; + return atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTING_WAIT; } static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s) @@ -274,6 +283,7 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBDS= tate *s) /* Finalize previous connection if any */ if (s->ioc) { nbd_client_detach_aio_context(s->bs); + yank_unregister_function(s->yank_name, nbd_yank, s->bs); object_unref(OBJECT(s->sioc)); s->sioc =3D NULL; object_unref(OBJECT(s->ioc)); @@ -305,7 +315,7 @@ static coroutine_fn void nbd_co_reconnect_loop(BDRVNBDS= tate *s) nbd_reconnect_attempt(s); while (nbd_client_connecting(s)) { - if (s->state =3D=3D NBD_CLIENT_CONNECTING_WAIT && + if (atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTING_WAIT && qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - start_time_ns > delay= _ns) { s->state =3D NBD_CLIENT_CONNECTING_NOWAIT; @@ -341,7 +351,7 @@ static coroutine_fn void nbd_connection_entry(void *opa= que) int ret =3D 0; Error *local_err =3D NULL; - while (s->state !=3D NBD_CLIENT_QUIT) { + while (atomic_read(&s->state) !=3D NBD_CLIENT_QUIT) { /* * The NBD client can only really be considered idle when it has * yielded from qio_channel_readv_all_eof(), waiting for data. Thi= s is @@ -356,7 +366,7 @@ static coroutine_fn void nbd_connection_entry(void *opa= que) nbd_co_reconnect_loop(s); } - if (s->state !=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) !=3D NBD_CLIENT_CONNECTED) { continue; } @@ -411,6 +421,7 @@ static coroutine_fn void nbd_connection_entry(void *opa= que) s->connection_co =3D NULL; if (s->ioc) { nbd_client_detach_aio_context(s->bs); + yank_unregister_function(s->yank_name, nbd_yank, s->bs); object_unref(OBJECT(s->sioc)); s->sioc =3D NULL; object_unref(OBJECT(s->ioc)); @@ -435,7 +446,7 @@ static int nbd_co_send_request(BlockDriverState *bs, qemu_co_queue_wait(&s->free_sema, &s->send_mutex); } - if (s->state !=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) !=3D NBD_CLIENT_CONNECTED) { rc =3D -EIO; goto err; } @@ -462,7 +473,7 @@ static int nbd_co_send_request(BlockDriverState *bs, if (qiov) { qio_channel_set_cork(s->ioc, true); rc =3D nbd_send_request(s->ioc, request); - if (rc >=3D 0 && s->state =3D=3D NBD_CLIENT_CONNECTED) { + if (rc >=3D 0 && atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTE= D) { if (qio_channel_writev_all(s->ioc, qiov->iov, qiov->niov, NULL) < 0) { rc =3D -EIO; @@ -777,7 +788,7 @@ static coroutine_fn int nbd_co_do_receive_one_chunk( s->requests[i].receiving =3D true; qemu_coroutine_yield(); s->requests[i].receiving =3D false; - if (s->state !=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) !=3D NBD_CLIENT_CONNECTED) { error_setg(errp, "Connection closed"); return -EIO; } @@ -936,7 +947,7 @@ static bool nbd_reply_chunk_iter_receive(BDRVNBDState *= s, NBDReply local_reply; NBDStructuredReplyChunk *chunk; Error *local_err =3D NULL; - if (s->state !=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) !=3D NBD_CLIENT_CONNECTED) { error_setg(&local_err, "Connection closed"); nbd_iter_channel_error(iter, -EIO, &local_err); goto break_loop; @@ -961,7 +972,8 @@ static bool nbd_reply_chunk_iter_receive(BDRVNBDState *= s, } /* Do not execute the body of NBD_FOREACH_REPLY_CHUNK for simple reply= . */ - if (nbd_reply_is_simple(reply) || s->state !=3D NBD_CLIENT_CONNECTED) { + if (nbd_reply_is_simple(reply) || + atomic_read(&s->state) !=3D NBD_CLIENT_CONNECTED) { goto break_loop; } @@ -1395,6 +1407,15 @@ static int nbd_client_reopen_prepare(BDRVReopenState= *state, return 0; } +static void nbd_yank(void *opaque) +{ + BlockDriverState *bs =3D opaque; + BDRVNBDState *s =3D (BDRVNBDState *)bs->opaque; + + qio_channel_shutdown(QIO_CHANNEL(s->sioc), QIO_CHANNEL_SHUTDOWN_BOTH, = NULL); + atomic_set(&s->state, NBD_CLIENT_QUIT); +} + static void nbd_client_close(BlockDriverState *bs) { BDRVNBDState *s =3D (BDRVNBDState *)bs->opaque; @@ -1407,25 +1428,29 @@ static void nbd_client_close(BlockDriverState *bs) nbd_teardown_connection(bs); } -static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr, - Error **errp) +static int nbd_establish_connection(BlockDriverState *bs, + SocketAddress *saddr, + Error **errp) { - QIOChannelSocket *sioc; + BDRVNBDState *s =3D (BDRVNBDState *)bs->opaque; Error *local_err =3D NULL; - sioc =3D qio_channel_socket_new(); - qio_channel_set_name(QIO_CHANNEL(sioc), "nbd-client"); + s->sioc =3D qio_channel_socket_new(); + qio_channel_set_name(QIO_CHANNEL(s->sioc), "nbd-client"); + yank_register_function(s->yank_name, nbd_yank, bs); - qio_channel_socket_connect_sync(sioc, saddr, &local_err); + qio_channel_socket_connect_sync(s->sioc, saddr, &local_err); if (local_err) { - object_unref(OBJECT(sioc)); + yank_unregister_function(s->yank_name, nbd_yank, bs); + object_unref(OBJECT(s->sioc)); + s->sioc =3D NULL; error_propagate(errp, local_err); - return NULL; + return -1; } - qio_channel_set_delay(QIO_CHANNEL(sioc), false); + qio_channel_set_delay(QIO_CHANNEL(s->sioc), false); - return sioc; + return 0; } static int nbd_client_connect(BlockDriverState *bs, Error **errp) @@ -1438,28 +1463,27 @@ static int nbd_client_connect(BlockDriverState *bs,= Error **errp) * establish TCP connection, return error if it fails * TODO: Configurable retry-until-timeout behaviour. */ - QIOChannelSocket *sioc =3D nbd_establish_connection(s->saddr, errp); - - if (!sioc) { + if (nbd_establish_connection(bs, s->saddr, errp) < 0) { return -ECONNREFUSED; } /* NBD handshake */ trace_nbd_client_connect(s->export); - qio_channel_set_blocking(QIO_CHANNEL(sioc), false, NULL); - qio_channel_attach_aio_context(QIO_CHANNEL(sioc), aio_context); + qio_channel_set_blocking(QIO_CHANNEL(s->sioc), false, NULL); + qio_channel_attach_aio_context(QIO_CHANNEL(s->sioc), aio_context); s->info.request_sizes =3D true; s->info.structured_reply =3D true; s->info.base_allocation =3D true; s->info.x_dirty_bitmap =3D g_strdup(s->x_dirty_bitmap); s->info.name =3D g_strdup(s->export ?: ""); - ret =3D nbd_receive_negotiate(aio_context, QIO_CHANNEL(sioc), s->tlscr= eds, + ret =3D nbd_receive_negotiate(aio_context, QIO_CHANNEL(s->sioc), s->tl= screds, s->hostname, &s->ioc, &s->info, errp); g_free(s->info.x_dirty_bitmap); g_free(s->info.name); if (ret < 0) { - object_unref(OBJECT(sioc)); + yank_unregister_function(s->yank_name, nbd_yank, bs); + object_unref(OBJECT(s->sioc)); return ret; } if (s->x_dirty_bitmap && !s->info.base_allocation) { @@ -1485,10 +1509,8 @@ static int nbd_client_connect(BlockDriverState *bs, = Error **errp) } } - s->sioc =3D sioc; - if (!s->ioc) { - s->ioc =3D QIO_CHANNEL(sioc); + s->ioc =3D QIO_CHANNEL(s->sioc); object_ref(OBJECT(s->ioc)); } @@ -1504,9 +1526,10 @@ static int nbd_client_connect(BlockDriverState *bs, = Error **errp) { NBDRequest request =3D { .type =3D NBD_CMD_DISC }; - nbd_send_request(s->ioc ?: QIO_CHANNEL(sioc), &request); + nbd_send_request(s->ioc ?: QIO_CHANNEL(s->sioc), &request); - object_unref(OBJECT(sioc)); + yank_unregister_function(s->yank_name, nbd_yank, bs); + object_unref(OBJECT(s->sioc)); return ret; } @@ -1913,6 +1936,9 @@ static int nbd_open(BlockDriverState *bs, QDict *opti= ons, int flags, qemu_co_mutex_init(&s->send_mutex); qemu_co_queue_init(&s->free_sema); + s->yank_name =3D g_strconcat("blockdev:", bs->node_name, NULL); + yank_register_instance(s->yank_name); + ret =3D nbd_client_connect(bs, errp); if (ret < 0) { nbd_clear_bdrvstate(s); @@ -1972,6 +1998,7 @@ static void nbd_close(BlockDriverState *bs) BDRVNBDState *s =3D bs->opaque; nbd_client_close(bs); + yank_unregister_instance(s->yank_name); nbd_clear_bdrvstate(s); } -- 2.20.1 --Sig_/Xn/AFqeuw58QJXwKLsHlj6C Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl7L59oACgkQNasLKJxd sliHmw//Z67be7D1wIleCpZD+/O881CBOZIzqYsDXS/bF4h75MvZm/9aKVv4BAvL VeqvagSQ8GHNNtcH2kseVbF8pMofD/mnO5HwVyQ70mkrpzFMd4yhonP+rslyzlgL kuYeEkfROv/lx1gUln1ibGQRxhwT+qcfiR8fVEivbCuH6DqZioILX5TKnfCtYvYk XFSYYoepSBul4Kgi4XLj4gFUVGpmVu1FEyl80ro6W0jOrXERYLArCUYeGA0PuUiY RSWsldtq5XlLq/BhR6LlrGOs/+P5mm1tSm8G/2IhFKrFEu5LQS00qxLjSfGYtaK+ KY3wgkAShwB6bZfWsjty0xc0nXzPg5TtRgds0aJdEF6fvLmqaW+IFAo7VIM5top6 tJnzclp9uTv2il/XX8w8I7msO8sLLs0ZNWQ9Ccz/cJGLFKrLhYQIi9RAJVROAWpP KOQ4Ez9BZdgYsxhNIbAFYH37p9AEceOWY9IVg9s4NJo+bmDVbLtLvDe4FXHhNvpr IwYfWMp6K6Qc/0W0QVnU0ogpkD5hSjo7YnZbHYION7gvkzHyNImCZZKIxzAmL7pJ ttEsqsypb2aguqdUoZbIomrtpdOfZil4dZd8rGkf1J89zKrIiLfuFBMrpEaZ8Dyq V5RN2XOfp9CvjRltIDahjsZLTdvmMPTLa+1V566jc+oi7EkFxF0= =rhU+ -----END PGP SIGNATURE----- --Sig_/Xn/AFqeuw58QJXwKLsHlj6C--