From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YM7CN-0004FW-LA for qemu-devel@nongnu.org; Thu, 12 Feb 2015 22:45:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YM7CK-0003fT-EN for qemu-devel@nongnu.org; Thu, 12 Feb 2015 22:45:47 -0500 Received: from mail-ig0-x232.google.com ([2607:f8b0:4001:c05::232]:34112) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YM7CK-0003eP-96 for qemu-devel@nongnu.org; Thu, 12 Feb 2015 22:45:44 -0500 Received: by mail-ig0-f178.google.com with SMTP id hl2so8272142igb.5 for ; Thu, 12 Feb 2015 19:45:43 -0800 (PST) From: Liu Yuan Date: Fri, 13 Feb 2015 11:45:42 +0800 Message-Id: <1423799142-21893-1-git-send-email-namei.unix@gmail.com> In-Reply-To: <87pp9f1b61.fsf@blackfin.pond.sub.org> References: <87pp9f1b61.fsf@blackfin.pond.sub.org> Subject: [Qemu-devel] [PATCH] sheepdog: fix confused return values List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, armbru@redhat.com Cc: sheepdog@lists.wpkg.org From: Liu Yuan These functions mix up -1 and -errno in return values and would might cause trouble error handling in the call chain. This patch let them return -errno and add some comments. Reported-by: Markus Armbruster Signed-off-by: Liu Yuan --- block/sheepdog.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/block/sheepdog.c b/block/sheepdog.c index be3176f..c28658c 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -527,6 +527,7 @@ static SheepdogAIOCB *sd_aio_setup(BlockDriverState *bs, QEMUIOVector *qiov, return acb; } +/* Return -EIO in case of error, file descriptor on success */ static int connect_to_sdog(BDRVSheepdogState *s, Error **errp) { int fd; @@ -546,11 +547,14 @@ static int connect_to_sdog(BDRVSheepdogState *s, Error **errp) if (fd >= 0) { qemu_set_nonblock(fd); + } else { + fd = -EIO; } return fd; } +/* Return 0 on success and -errno in case of error */ static coroutine_fn int send_co_req(int sockfd, SheepdogReq *hdr, void *data, unsigned int *wlen) { @@ -559,11 +563,13 @@ static coroutine_fn int send_co_req(int sockfd, SheepdogReq *hdr, void *data, ret = qemu_co_send(sockfd, hdr, sizeof(*hdr)); if (ret != sizeof(*hdr)) { error_report("failed to send a req, %s", strerror(errno)); + ret = -errno; return ret; } ret = qemu_co_send(sockfd, data, *wlen); if (ret != *wlen) { + ret = -errno; error_report("failed to send a req, %s", strerror(errno)); } @@ -638,6 +644,11 @@ out: srco->finished = true; } +/* + * Send the request to the sheep in a synchronous manner. + * + * Return 0 on success, -errno in case of error. + */ static int do_req(int sockfd, AioContext *aio_context, SheepdogReq *hdr, void *data, unsigned int *wlen, unsigned int *rlen) { -- 1.9.1