{"id":814949,"url":"http://patchwork.ozlabs.org/api/patches/814949/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918135935.255591-2-vsementsov@virtuozzo.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"<20170918135935.255591-2-vsementsov@virtuozzo.com>","list_archive_url":null,"date":"2017-09-18T13:59:29","name":"[v2,1/7] block/nbd-client: refactor nbd_co_receive_reply","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"be2de56a9669cdf69214fe69560e1f959a38e4ef","submitter":{"id":66592,"url":"http://patchwork.ozlabs.org/api/people/66592/?format=json","name":"Vladimir Sementsov-Ogievskiy","email":"vsementsov@virtuozzo.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918135935.255591-2-vsementsov@virtuozzo.com/mbox/","series":[{"id":3654,"url":"http://patchwork.ozlabs.org/api/series/3654/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3654","date":"2017-09-18T13:59:31","name":"nbd client refactoring and fixing","version":2,"mbox":"http://patchwork.ozlabs.org/series/3654/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814949/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814949/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=)","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 3xwnlp0hPgz9s7G\n\tfor ;\n\tTue, 19 Sep 2017 00:03:18 +1000 (AEST)","from localhost ([::1]:36798 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtwdo-0004Jz-54\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 10:03:16 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:38437)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtwaR-0001iL-A0\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:51 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtwaN-0001QQ-Ms\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:47 -0400","from mailhub.sw.ru ([195.214.232.25]:37069 helo=relay.sw.ru)\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 1dtwaN-0001P3-B3\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:43 -0400","from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6])\n\tby relay.sw.ru (8.13.4/8.13.4) with ESMTP id v8IDxZdV022049;\n\tMon, 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:29 +0300","Message-Id":"<20170918135935.255591-2-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 1/7] block/nbd-client: refactor\n\tnbd_co_receive_reply","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":"kwolf@redhat.com, vsementsov@virtuozzo.com, mreitz@redhat.com,\n\tden@openvz.org, pbonzini@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"\"NBDReply *reply\" parameter of nbd_co_receive_reply is used only\nto pass return value for nbd_co_request (reply.error). Remove it\nand use function return value instead.\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy \n---\n block/nbd-client.c | 30 +++++++++++++++---------------\n 1 file changed, 15 insertions(+), 15 deletions(-)","diff":"diff --git a/block/nbd-client.c b/block/nbd-client.c\nindex ee7f758e68..acd8e5d007 100644\n--- a/block/nbd-client.c\n+++ b/block/nbd-client.c\n@@ -178,26 +178,26 @@ err:\n return rc;\n }\n \n-static void nbd_co_receive_reply(NBDClientSession *s,\n- NBDRequest *request,\n- NBDReply *reply,\n- QEMUIOVector *qiov)\n+static int nbd_co_receive_reply(NBDClientSession *s,\n+ NBDRequest *request,\n+ QEMUIOVector *qiov)\n {\n+ int ret;\n int i = HANDLE_TO_INDEX(s, request->handle);\n \n /* Wait until we're woken up by nbd_read_reply_entry. */\n s->requests[i].receiving = true;\n qemu_coroutine_yield();\n s->requests[i].receiving = false;\n- *reply = s->reply;\n- if (reply->handle != request->handle || !s->ioc || s->quit) {\n- reply->error = EIO;\n+ if (s->reply.handle != request->handle || !s->ioc || s->quit) {\n+ ret = -EIO;\n } else {\n- if (qiov && reply->error == 0) {\n+ ret = -s->reply.error;\n+ if (qiov && s->reply.error == 0) {\n assert(request->len == iov_size(qiov->iov, qiov->niov));\n if (qio_channel_readv_all(s->ioc, qiov->iov, qiov->niov,\n NULL) < 0) {\n- reply->error = EIO;\n+ ret = -EIO;\n s->quit = true;\n }\n }\n@@ -217,6 +217,8 @@ static void nbd_co_receive_reply(NBDClientSession *s,\n s->in_flight--;\n qemu_co_queue_next(&s->free_sema);\n qemu_co_mutex_unlock(&s->send_mutex);\n+\n+ return ret;\n }\n \n static int nbd_co_request(BlockDriverState *bs,\n@@ -224,7 +226,6 @@ static int nbd_co_request(BlockDriverState *bs,\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@@ -232,12 +233,11 @@ static int nbd_co_request(BlockDriverState *bs,\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+ return ret;\n }\n- return -reply.error;\n+\n+ return nbd_co_receive_reply(client, request,\n+ request->type == NBD_CMD_READ ? qiov : NULL);\n }\n \n int nbd_client_co_preadv(BlockDriverState *bs, uint64_t offset,\n","prefixes":["v2","1/7"]}