{"id":807846,"url":"http://patchwork.ozlabs.org/api/1.2/patches/807846/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830180711.7974-8-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-8-eblake@redhat.com>","list_archive_url":null,"date":"2017-08-30T18:07:07","name":"[PULL,07/11] nbd/client: refactor nbd_receive_reply","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"d2e9151198fe95307f582620967e6226527b4346","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-8-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/807846/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807846/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-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.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 3xjDG31zNfz9s8J\n\tfor ;\n\tThu, 31 Aug 2017 04:15:55 +1000 (AEST)","from localhost ([::1]:52086 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn7Wr-0000qU-27\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 14:15:53 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:53235)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn7Ou-00025r-Ie\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 14:07:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn7Op-0001ea-LT\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 14:07:40 -0400","from mx1.redhat.com ([209.132.183.28]:58320)\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 1dn7Oi-0001bO-5Z; Wed, 30 Aug 2017 14:07:28 -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 390764A6F1;\n\tWed, 30 Aug 2017 18:07:27 +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 DAB7E17106;\n\tWed, 30 Aug 2017 18:07:25 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 390764A6F1","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 13:07:07 -0500","Message-Id":"<20170830180711.7974-8-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.38]);\n\tWed, 30 Aug 2017 18:07:27 +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 07/11] nbd/client: refactor nbd_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":"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\nRefactor nbd_receive_reply to return 1 on success, 0 on eof, when no\ndata was read and <0 for other cases, because returned size of read\ndata is not actually used.\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy \nMessage-Id: <20170804151440.320927-4-vsementsov@virtuozzo.com>\n[eblake: tweak function comments]\nSigned-off-by: Eric Blake \n---\n include/block/nbd.h | 2 +-\n nbd/client.c | 12 +++++++++---\n 2 files changed, 10 insertions(+), 4 deletions(-)","diff":"diff --git a/include/block/nbd.h b/include/block/nbd.h\nindex 9c3d0a5868..f7450608b4 100644\n--- a/include/block/nbd.h\n+++ b/include/block/nbd.h\n@@ -164,7 +164,7 @@ int nbd_receive_negotiate(QIOChannel *ioc, const char *name,\n int nbd_init(int fd, QIOChannelSocket *sioc, NBDExportInfo *info,\n Error **errp);\n ssize_t nbd_send_request(QIOChannel *ioc, NBDRequest *request);\n-ssize_t nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp);\n+int nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp);\n int nbd_client(int fd);\n int nbd_disconnect(int fd);\n\ndiff --git a/nbd/client.c b/nbd/client.c\nindex 4556056daa..f8c213bc96 100644\n--- a/nbd/client.c\n+++ b/nbd/client.c\n@@ -914,11 +914,16 @@ ssize_t nbd_send_request(QIOChannel *ioc, NBDRequest *request)\n return nbd_write(ioc, buf, sizeof(buf), NULL);\n }\n\n-ssize_t nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp)\n+/* nbd_receive_reply\n+ * Returns 1 on success\n+ * 0 on eof, when no data was read (errp is not set)\n+ * negative errno on failure (errp is set)\n+ */\n+int nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp)\n {\n uint8_t buf[NBD_REPLY_SIZE];\n uint32_t magic;\n- ssize_t ret;\n+ int ret;\n\n ret = nbd_read_eof(ioc, buf, sizeof(buf), errp);\n if (ret <= 0) {\n@@ -948,6 +953,7 @@ ssize_t nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp)\n error_setg(errp, \"invalid magic (got 0x%\" PRIx32 \")\", magic);\n return -EINVAL;\n }\n- return sizeof(buf);\n+\n+ return 1;\n }\n\n","prefixes":["PULL","07/11"]}