From nobody Tue Feb 10 19:47:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505743468774995.0047540692537; Mon, 18 Sep 2017 07:04:28 -0700 (PDT) Received: from localhost ([::1]:36801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtwew-0005aO-QW for importer@patchew.org; Mon, 18 Sep 2017 10:04:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtwaT-0001kX-7t for qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dtwaS-0001TO-Aa for qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:49 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:19804 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dtwaR-0001S7-Vc for qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:48 -0400 Received: from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v8IDxZda022049; Mon, 18 Sep 2017 16:59:37 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 18 Sep 2017 16:59:34 +0300 Message-Id: <20170918135935.255591-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170918135935.255591-1-vsementsov@virtuozzo.com> References: <20170918135935.255591-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH v2 6/7] block/nbd-client: early fail nbd_read_reply_entry if s->quit is set X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, mreitz@redhat.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Do not continue any operation if s->quit is set in parallel. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd-client.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/block/nbd-client.c b/block/nbd-client.c index 280147e6a7..f80a4c5564 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -81,7 +81,7 @@ static coroutine_fn void nbd_read_reply_entry(void *opaqu= e) if (ret < 0) { error_report_err(local_err); } - if (ret <=3D 0) { + if (ret <=3D 0 || s->quit) { break; } =20 @@ -105,9 +105,8 @@ static coroutine_fn void nbd_read_reply_entry(void *opa= que) assert(qiov !=3D NULL); assert(s->requests[i].request->len =3D=3D iov_size(qiov->iov, qiov->niov)); - if (qio_channel_readv_all(s->ioc, qiov->iov, qiov->niov, - NULL) < 0) - { + ret =3D qio_channel_readv_all(s->ioc, qiov->iov, qiov->niov, N= ULL); + if (ret < 0 || s->quit) { s->requests[i].ret =3D -EIO; break; } --=20 2.11.1