{"id":807840,"url":"http://patchwork.ozlabs.org/api/1.2/patches/807840/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830180711.7974-12-eblake@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170830180711.7974-12-eblake@redhat.com>","list_archive_url":null,"date":"2017-08-30T18:07:11","name":"[PULL,11/11] block/nbd-client: refactor request send/receive","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"4ff1d3de393e620f07cdce335ddfe705efa70deb","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/1.2/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830180711.7974-12-eblake@redhat.com/mbox/","series":[{"id":679,"url":"http://patchwork.ozlabs.org/api/1.2/series/679/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=679","date":"2017-08-30T18:07:00","name":"[PULL,01/11] qemu-iotests: Extend non-shared storage migration test (194)","version":1,"mbox":"http://patchwork.ozlabs.org/series/679/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807840/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807840/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjD8X3yZlz9s8J\n\tfor ;\n\tThu, 31 Aug 2017 04:11:08 +1000 (AEST)","from localhost ([::1]:52058 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn7SE-00055n-6c\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 14:11:06 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:53277)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn7Oy-00029P-73\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 14:07:45 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn7Ou-0001fm-VK\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 14:07:44 -0400","from mx1.redhat.com ([209.132.183.28]:58848)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dn7Oo-0001dw-GV; Wed, 30 Aug 2017 14:07:34 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 902E47EA93;\n\tWed, 30 Aug 2017 18:07:33 +0000 (UTC)","from red.redhat.com (ovpn-122-186.rdu2.redhat.com [10.10.122.186])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 956A217106;\n\tWed, 30 Aug 2017 18:07:32 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 902E47EA93","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\n\t(mx1.redhat.com [10.5.110.28]);\n\tWed, 30 Aug 2017 18:07:33 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 11/11] block/nbd-client: refactor request\n\tsend/receive","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Kevin Wolf , Paolo Bonzini ,\n\tVladimir Sementsov-Ogievskiy ,\n\t\"open list:Network Block Dev...\" ,\n\tMax Reitz ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Vladimir Sementsov-Ogievskiy \n\nAdd nbd_co_request, to remove code duplications in\nnbd_client_co_{pwrite,pread,...} functions. Also this is\nneeded for further refactoring.\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy \nMessage-Id: <20170804151440.320927-8-vsementsov@virtuozzo.com>\n[eblake: make nbd_co_request a wrapper, rather than merging two\nexisting functions]\nSigned-off-by: Eric Blake \n---\n block/nbd-client.c | 73 +++++++++++++++++++-----------------------------------\n 1 file changed, 26 insertions(+), 47 deletions(-)","diff":"diff --git a/block/nbd-client.c b/block/nbd-client.c\nindex 322b725ff9..f0dbea24d3 100644\n--- a/block/nbd-client.c\n+++ b/block/nbd-client.c\n@@ -220,28 +220,40 @@ static void nbd_co_receive_reply(NBDClientSession *s,\n qemu_co_mutex_unlock(&s->send_mutex);\n }\n\n+static int nbd_co_request(BlockDriverState *bs,\n+ NBDRequest *request,\n+ QEMUIOVector *qiov)\n+{\n+ NBDClientSession *client = nbd_get_client_session(bs);\n+ NBDReply reply;\n+ int ret;\n+\n+ assert(!qiov || request->type == NBD_CMD_WRITE ||\n+ request->type == NBD_CMD_READ);\n+ ret = nbd_co_send_request(bs, request,\n+ request->type == NBD_CMD_WRITE ? qiov : NULL);\n+ if (ret < 0) {\n+ reply.error = -ret;\n+ } else {\n+ nbd_co_receive_reply(client, request, &reply,\n+ request->type == NBD_CMD_READ ? qiov : NULL);\n+ }\n+ return -reply.error;\n+}\n+\n int nbd_client_co_preadv(BlockDriverState *bs, uint64_t offset,\n uint64_t bytes, QEMUIOVector *qiov, int flags)\n {\n- NBDClientSession *client = nbd_get_client_session(bs);\n NBDRequest request = {\n .type = NBD_CMD_READ,\n .from = offset,\n .len = bytes,\n };\n- NBDReply reply;\n- int ret;\n\n assert(bytes <= NBD_MAX_BUFFER_SIZE);\n assert(!flags);\n\n- ret = nbd_co_send_request(bs, &request, NULL);\n- if (ret < 0) {\n- reply.error = -ret;\n- } else {\n- nbd_co_receive_reply(client, &request, &reply, qiov);\n- }\n- return -reply.error;\n+ return nbd_co_request(bs, &request, qiov);\n }\n\n int nbd_client_co_pwritev(BlockDriverState *bs, uint64_t offset,\n@@ -253,8 +265,6 @@ int nbd_client_co_pwritev(BlockDriverState *bs, uint64_t offset,\n .from = offset,\n .len = bytes,\n };\n- NBDReply reply;\n- int ret;\n\n if (flags & BDRV_REQ_FUA) {\n assert(client->info.flags & NBD_FLAG_SEND_FUA);\n@@ -263,26 +273,18 @@ int nbd_client_co_pwritev(BlockDriverState *bs, uint64_t offset,\n\n assert(bytes <= NBD_MAX_BUFFER_SIZE);\n\n- ret = nbd_co_send_request(bs, &request, qiov);\n- if (ret < 0) {\n- reply.error = -ret;\n- } else {\n- nbd_co_receive_reply(client, &request, &reply, NULL);\n- }\n- return -reply.error;\n+ return nbd_co_request(bs, &request, qiov);\n }\n\n int nbd_client_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset,\n int bytes, BdrvRequestFlags flags)\n {\n- int ret;\n NBDClientSession *client = nbd_get_client_session(bs);\n NBDRequest request = {\n .type = NBD_CMD_WRITE_ZEROES,\n .from = offset,\n .len = bytes,\n };\n- NBDReply reply;\n\n if (!(client->info.flags & NBD_FLAG_SEND_WRITE_ZEROES)) {\n return -ENOTSUP;\n@@ -296,21 +298,13 @@ int nbd_client_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset,\n request.flags |= NBD_CMD_FLAG_NO_HOLE;\n }\n\n- ret = nbd_co_send_request(bs, &request, NULL);\n- if (ret < 0) {\n- reply.error = -ret;\n- } else {\n- nbd_co_receive_reply(client, &request, &reply, NULL);\n- }\n- return -reply.error;\n+ return nbd_co_request(bs, &request, NULL);\n }\n\n int nbd_client_co_flush(BlockDriverState *bs)\n {\n NBDClientSession *client = nbd_get_client_session(bs);\n NBDRequest request = { .type = NBD_CMD_FLUSH };\n- NBDReply reply;\n- int ret;\n\n if (!(client->info.flags & NBD_FLAG_SEND_FLUSH)) {\n return 0;\n@@ -319,13 +313,7 @@ int nbd_client_co_flush(BlockDriverState *bs)\n request.from = 0;\n request.len = 0;\n\n- ret = nbd_co_send_request(bs, &request, NULL);\n- if (ret < 0) {\n- reply.error = -ret;\n- } else {\n- nbd_co_receive_reply(client, &request, &reply, NULL);\n- }\n- return -reply.error;\n+ return nbd_co_request(bs, &request, NULL);\n }\n\n int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes)\n@@ -336,21 +324,12 @@ int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes)\n .from = offset,\n .len = bytes,\n };\n- NBDReply reply;\n- int ret;\n\n if (!(client->info.flags & NBD_FLAG_SEND_TRIM)) {\n return 0;\n }\n\n- ret = nbd_co_send_request(bs, &request, NULL);\n- if (ret < 0) {\n- reply.error = -ret;\n- } else {\n- nbd_co_receive_reply(client, &request, &reply, NULL);\n- }\n- return -reply.error;\n-\n+ return nbd_co_request(bs, &request, NULL);\n }\n\n void nbd_client_detach_aio_context(BlockDriverState *bs)\n","prefixes":["PULL","11/11"]}