{"id":807836,"url":"http://patchwork.ozlabs.org/api/1.2/patches/807836/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830180711.7974-7-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-7-eblake@redhat.com>","list_archive_url":null,"date":"2017-08-30T18:07:06","name":"[PULL,06/11] nbd/client: refactor nbd_read_eof","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"48a09fa2583fba852f7357ff6925b1bce8d70a7b","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-7-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/807836/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807836/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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.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 3xjD5J5p45z9sNc\n\tfor ;\n\tThu, 31 Aug 2017 04:08:20 +1000 (AEST)","from localhost ([::1]:52039 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn7PW-00020q-GH\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 14:08:18 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:53134)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn7Om-0001wT-0g\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 14:07:33 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn7Ol-0001cU-1O\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 14:07:31 -0400","from mx1.redhat.com ([209.132.183.28]:54540)\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 1dn7Og-0001aQ-KG; Wed, 30 Aug 2017 14:07:26 -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 A1382C04B938;\n\tWed, 30 Aug 2017 18:07:25 +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 8BC0717106;\n\tWed, 30 Aug 2017 18:07:24 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A1382C04B938","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 13:07:06 -0500","Message-Id":"<20170830180711.7974-7-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.31]);\n\tWed, 30 Aug 2017 18:07:25 +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 06/11] nbd/client: refactor nbd_read_eof","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_read_eof to return 1 on success, 0 on eof, when no\ndata was read and <0 for other cases, because returned size of\nread data is not actually used.\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy \nMessage-Id: <20170804151440.320927-3-vsementsov@virtuozzo.com>\n[eblake: tweak function comments, rebase to test 083 enhancements]\nSigned-off-by: Eric Blake \n---\n nbd/nbd-internal.h | 33 ++++++++++++++++++++++++---------\n nbd/client.c | 5 -----\n tests/qemu-iotests/083.out | 8 ++++----\n 3 files changed, 28 insertions(+), 18 deletions(-)","diff":"diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h\nindex 396ddb4d3e..03549e3f39 100644\n--- a/nbd/nbd-internal.h\n+++ b/nbd/nbd-internal.h\n@@ -77,21 +77,36 @@\n #define NBD_ESHUTDOWN 108\n\n /* nbd_read_eof\n- * Tries to read @size bytes from @ioc. Returns number of bytes actually read.\n- * May return a value >= 0 and < size only on EOF, i.e. when iteratively called\n- * qio_channel_readv() returns 0. So, there is no need to call nbd_read_eof\n- * iteratively.\n+ * Tries to read @size bytes from @ioc.\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-static inline ssize_t nbd_read_eof(QIOChannel *ioc, void *buffer, size_t size,\n- Error **errp)\n+static inline int nbd_read_eof(QIOChannel *ioc, void *buffer, size_t size,\n+ Error **errp)\n {\n struct iovec iov = { .iov_base = buffer, .iov_len = size };\n+ ssize_t ret;\n+\n /* Sockets are kept in blocking mode in the negotiation phase. After\n * that, a non-readable socket simply means that another thread stole\n * our request/reply. Synchronization is done with recv_coroutine, so\n * that this is coroutine-safe.\n */\n- return nbd_rwv(ioc, &iov, 1, size, true, errp);\n+\n+ assert(size);\n+\n+ ret = nbd_rwv(ioc, &iov, 1, size, true, errp);\n+ if (ret <= 0) {\n+ return ret;\n+ }\n+\n+ if (ret != size) {\n+ error_setg(errp, \"End of file\");\n+ return -EINVAL;\n+ }\n+\n+ return 1;\n }\n\n /* nbd_read\n@@ -100,9 +115,9 @@ static inline ssize_t nbd_read_eof(QIOChannel *ioc, void *buffer, size_t size,\n static inline int nbd_read(QIOChannel *ioc, void *buffer, size_t size,\n Error **errp)\n {\n- ssize_t ret = nbd_read_eof(ioc, buffer, size, errp);\n+ int ret = nbd_read_eof(ioc, buffer, size, errp);\n\n- if (ret >= 0 && ret != size) {\n+ if (ret == 0) {\n ret = -EINVAL;\n error_setg(errp, \"End of file\");\n }\ndiff --git a/nbd/client.c b/nbd/client.c\nindex f1c16b588f..4556056daa 100644\n--- a/nbd/client.c\n+++ b/nbd/client.c\n@@ -925,11 +925,6 @@ ssize_t nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp)\n return ret;\n }\n\n- if (ret != sizeof(buf)) {\n- error_setg(errp, \"read failed\");\n- return -EINVAL;\n- }\n-\n /* Reply\n [ 0 .. 3] magic (NBD_REPLY_MAGIC)\n [ 4 .. 7] error (0 == no error)\ndiff --git a/tests/qemu-iotests/083.out b/tests/qemu-iotests/083.out\nindex a7fb081889..fb71b6f8ad 100644\n--- a/tests/qemu-iotests/083.out\n+++ b/tests/qemu-iotests/083.out\n@@ -69,12 +69,12 @@ read failed: Input/output error\n\n === Check disconnect 4 reply ===\n\n-read failed\n+End of file\n read failed: Input/output error\n\n === Check disconnect 8 reply ===\n\n-read failed\n+End of file\n read failed: Input/output error\n\n === Check disconnect before data ===\n@@ -180,12 +180,12 @@ read failed: Input/output error\n\n === Check disconnect 4 reply ===\n\n-read failed\n+End of file\n read failed: Input/output error\n\n === Check disconnect 8 reply ===\n\n-read failed\n+End of file\n read failed: Input/output error\n\n === Check disconnect before data ===\n","prefixes":["PULL","06/11"]}