{"id":814951,"url":"http://patchwork.ozlabs.org/api/patches/814951/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918135935.255591-5-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-5-vsementsov@virtuozzo.com>","list_archive_url":null,"date":"2017-09-18T13:59:32","name":"[v2,4/7] block/nbd-client: drop reply field from NBDClientSession","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"e7c992a0569f9bd076e246b203bf9914066e54b1","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-5-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/814951/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814951/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 3xwnmz1nNzz9s7M\n\tfor ;\n\tTue, 19 Sep 2017 00:04:19 +1000 (AEST)","from localhost ([::1]:36800 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtwen-0005F0-9u\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 10:04:17 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:38536)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtwaW-0001nk-Dz\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:53 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtwaS-0001TY-IF\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:52 -0400","from mailhub.sw.ru ([195.214.232.25]:2677 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 1dtwaS-0001SD-6o\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 09:59:48 -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 v8IDxZdY022049;\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:32 +0300","Message-Id":"<20170918135935.255591-5-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 4/7] block/nbd-client: drop reply field from\n\tNBDClientSession","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":"Drop 'reply' from NBDClientSession. It's used to only deliver request\nreturn code to receiving coroutine. Instead introduce per-request ret\nvariable to simplify the scheme and make further refactoring possible.\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy \n---\n block/nbd-client.h | 2 +-\n block/nbd-client.c | 22 +++++++++-------------\n 2 files changed, 10 insertions(+), 14 deletions(-)","diff":"diff --git a/block/nbd-client.h b/block/nbd-client.h\nindex 3f97d31013..4bc8fe3993 100644\n--- a/block/nbd-client.h\n+++ b/block/nbd-client.h\n@@ -22,6 +22,7 @@ typedef struct {\n bool receiving; /* waiting for read_reply_co? */\n NBDRequest *request;\n QEMUIOVector *qiov;\n+ int ret;\n } NBDClientRequest;\n \n typedef struct NBDClientSession {\n@@ -35,7 +36,6 @@ typedef struct NBDClientSession {\n int in_flight;\n \n NBDClientRequest requests[MAX_NBD_REQUESTS];\n- NBDReply reply;\n bool quit;\n } NBDClientSession;\n \ndiff --git a/block/nbd-client.c b/block/nbd-client.c\nindex f7b642f079..f331f08a9a 100644\n--- a/block/nbd-client.c\n+++ b/block/nbd-client.c\n@@ -74,10 +74,10 @@ static coroutine_fn void nbd_read_reply_entry(void *opaque)\n uint64_t i;\n int ret = 0;\n Error *local_err = NULL;\n+ NBDReply reply;\n \n while (!s->quit) {\n- assert(s->reply.handle == 0);\n- ret = nbd_receive_reply(s->ioc, &s->reply, &local_err);\n+ ret = nbd_receive_reply(s->ioc, &reply, &local_err);\n if (ret < 0) {\n error_report_err(local_err);\n }\n@@ -89,18 +89,18 @@ static coroutine_fn void nbd_read_reply_entry(void *opaque)\n * handler acts as a synchronization point and ensures that only\n * one coroutine is called until the reply finishes.\n */\n- i = HANDLE_TO_INDEX(s, s->reply.handle);\n+ i = HANDLE_TO_INDEX(s, reply.handle);\n if (i >= MAX_NBD_REQUESTS ||\n !s->requests[i].coroutine ||\n !s->requests[i].receiving ||\n- s->reply.handle != s->requests[i].request->handle)\n+ reply.handle != s->requests[i].request->handle)\n {\n break;\n }\n \n- if (s->reply.error == 0 &&\n- s->requests[i].request->type == NBD_CMD_READ)\n- {\n+ s->requests[i].ret = -reply.error;\n+\n+ if (reply.error == 0 && s->requests[i].request->type == NBD_CMD_READ) {\n QEMUIOVector *qiov = s->requests[i].qiov;\n assert(qiov != NULL);\n assert(s->requests[i].request->len ==\n@@ -108,7 +108,7 @@ static coroutine_fn void nbd_read_reply_entry(void *opaque)\n if (qio_channel_readv_all(s->ioc, qiov->iov, qiov->niov,\n NULL) < 0)\n {\n- s->reply.error = EIO;\n+ s->requests[i].ret = -EIO;\n break;\n }\n }\n@@ -211,11 +211,7 @@ static int nbd_co_receive_reply(NBDClientSession *s, NBDRequest *request)\n if (!s->ioc || s->quit) {\n ret = -EIO;\n } else {\n- assert(s->reply.handle == request->handle);\n- ret = -s->reply.error;\n-\n- /* Tell the read handler to read another header. */\n- s->reply.handle = 0;\n+ ret = s->requests[i].ret;\n }\n \n s->requests[i].coroutine = NULL;\n","prefixes":["v2","4/7"]}