From nobody Sun Oct 5 19:25:47 2025 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 1504116736727619.2067379375762; Wed, 30 Aug 2017 11:12:16 -0700 (PDT) Received: from localhost ([::1]:52062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dn7TJ-0006BG-B4 for importer@patchew.org; Wed, 30 Aug 2017 14:12:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dn7Oy-00029P-73 for qemu-devel@nongnu.org; Wed, 30 Aug 2017 14:07:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dn7Ou-0001fm-VK for qemu-devel@nongnu.org; Wed, 30 Aug 2017 14:07:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58848) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dn7Oo-0001dw-GV; Wed, 30 Aug 2017 14:07:34 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 902E47EA93; Wed, 30 Aug 2017 18:07:33 +0000 (UTC) Received: from red.redhat.com (ovpn-122-186.rdu2.redhat.com [10.10.122.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 956A217106; Wed, 30 Aug 2017 18:07:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 902E47EA93 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=eblake@redhat.com From: Eric Blake To: qemu-devel@nongnu.org Date: Wed, 30 Aug 2017 13:07:11 -0500 Message-Id: <20170830180711.7974-12-eblake@redhat.com> In-Reply-To: <20170830180711.7974-1-eblake@redhat.com> References: <20170830180711.7974-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 30 Aug 2017 18:07:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 11/11] block/nbd-client: refactor request send/receive 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: Kevin Wolf , Paolo Bonzini , Vladimir Sementsov-Ogievskiy , "open list:Network Block Dev..." , Max Reitz 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" From: Vladimir Sementsov-Ogievskiy Add nbd_co_request, to remove code duplications in nbd_client_co_{pwrite,pread,...} functions. Also this is needed for further refactoring. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20170804151440.320927-8-vsementsov@virtuozzo.com> [eblake: make nbd_co_request a wrapper, rather than merging two existing functions] Signed-off-by: Eric Blake --- block/nbd-client.c | 73 +++++++++++++++++++-------------------------------= ---- 1 file changed, 26 insertions(+), 47 deletions(-) diff --git a/block/nbd-client.c b/block/nbd-client.c index 322b725ff9..f0dbea24d3 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -220,28 +220,40 @@ static void nbd_co_receive_reply(NBDClientSession *s, qemu_co_mutex_unlock(&s->send_mutex); } +static int nbd_co_request(BlockDriverState *bs, + NBDRequest *request, + QEMUIOVector *qiov) +{ + NBDClientSession *client =3D nbd_get_client_session(bs); + NBDReply reply; + int ret; + + assert(!qiov || request->type =3D=3D NBD_CMD_WRITE || + request->type =3D=3D NBD_CMD_READ); + ret =3D nbd_co_send_request(bs, request, + request->type =3D=3D NBD_CMD_WRITE ? qiov : = NULL); + if (ret < 0) { + reply.error =3D -ret; + } else { + nbd_co_receive_reply(client, request, &reply, + request->type =3D=3D NBD_CMD_READ ? qiov : NU= LL); + } + return -reply.error; +} + int nbd_client_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags) { - NBDClientSession *client =3D nbd_get_client_session(bs); NBDRequest request =3D { .type =3D NBD_CMD_READ, .from =3D offset, .len =3D bytes, }; - NBDReply reply; - int ret; assert(bytes <=3D NBD_MAX_BUFFER_SIZE); assert(!flags); - ret =3D nbd_co_send_request(bs, &request, NULL); - if (ret < 0) { - reply.error =3D -ret; - } else { - nbd_co_receive_reply(client, &request, &reply, qiov); - } - return -reply.error; + return nbd_co_request(bs, &request, qiov); } int nbd_client_co_pwritev(BlockDriverState *bs, uint64_t offset, @@ -253,8 +265,6 @@ int nbd_client_co_pwritev(BlockDriverState *bs, uint64_= t offset, .from =3D offset, .len =3D bytes, }; - NBDReply reply; - int ret; if (flags & BDRV_REQ_FUA) { assert(client->info.flags & NBD_FLAG_SEND_FUA); @@ -263,26 +273,18 @@ int nbd_client_co_pwritev(BlockDriverState *bs, uint6= 4_t offset, assert(bytes <=3D NBD_MAX_BUFFER_SIZE); - ret =3D nbd_co_send_request(bs, &request, qiov); - if (ret < 0) { - reply.error =3D -ret; - } else { - nbd_co_receive_reply(client, &request, &reply, NULL); - } - return -reply.error; + return nbd_co_request(bs, &request, qiov); } int nbd_client_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int bytes, BdrvRequestFlags flags) { - int ret; NBDClientSession *client =3D nbd_get_client_session(bs); NBDRequest request =3D { .type =3D NBD_CMD_WRITE_ZEROES, .from =3D offset, .len =3D bytes, }; - NBDReply reply; if (!(client->info.flags & NBD_FLAG_SEND_WRITE_ZEROES)) { return -ENOTSUP; @@ -296,21 +298,13 @@ int nbd_client_co_pwrite_zeroes(BlockDriverState *bs,= int64_t offset, request.flags |=3D NBD_CMD_FLAG_NO_HOLE; } - ret =3D nbd_co_send_request(bs, &request, NULL); - if (ret < 0) { - reply.error =3D -ret; - } else { - nbd_co_receive_reply(client, &request, &reply, NULL); - } - return -reply.error; + return nbd_co_request(bs, &request, NULL); } int nbd_client_co_flush(BlockDriverState *bs) { NBDClientSession *client =3D nbd_get_client_session(bs); NBDRequest request =3D { .type =3D NBD_CMD_FLUSH }; - NBDReply reply; - int ret; if (!(client->info.flags & NBD_FLAG_SEND_FLUSH)) { return 0; @@ -319,13 +313,7 @@ int nbd_client_co_flush(BlockDriverState *bs) request.from =3D 0; request.len =3D 0; - ret =3D nbd_co_send_request(bs, &request, NULL); - if (ret < 0) { - reply.error =3D -ret; - } else { - nbd_co_receive_reply(client, &request, &reply, NULL); - } - return -reply.error; + return nbd_co_request(bs, &request, NULL); } int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes) @@ -336,21 +324,12 @@ int nbd_client_co_pdiscard(BlockDriverState *bs, int6= 4_t offset, int bytes) .from =3D offset, .len =3D bytes, }; - NBDReply reply; - int ret; if (!(client->info.flags & NBD_FLAG_SEND_TRIM)) { return 0; } - ret =3D nbd_co_send_request(bs, &request, NULL); - if (ret < 0) { - reply.error =3D -ret; - } else { - nbd_co_receive_reply(client, &request, &reply, NULL); - } - return -reply.error; - + return nbd_co_request(bs, &request, NULL); } void nbd_client_detach_aio_context(BlockDriverState *bs) --=20 2.13.5