From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBLjs-0007SG-PE for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:18:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RBLjp-0006GR-Pl for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:18:00 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:35870) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBLjp-0006EY-IH for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:17:57 -0400 Received: by mail-wy0-f173.google.com with SMTP id 22so1507475wyh.4 for ; Wed, 05 Oct 2011 00:17:57 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 5 Oct 2011 09:17:39 +0200 Message-Id: <1317799065-29668-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1317799065-29668-1-git-send-email-pbonzini@redhat.com> References: <1317799065-29668-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3 09/15] nbd: fix error handling in the server List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org bdrv_read and bdrv_write return negative errno values, not -1. Signed-off-by: Paolo Bonzini --- nbd.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/nbd.c b/nbd.c index fb5e424..5df9745 100644 --- a/nbd.c +++ b/nbd.c @@ -580,6 +580,7 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, { struct nbd_request request; struct nbd_reply reply; + int ret; TRACE("Reading request."); @@ -618,12 +619,13 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, case NBD_CMD_READ: TRACE("Request type is READ"); - if (bdrv_read(bs, (request.from + dev_offset) / 512, - data + NBD_REPLY_SIZE, - request.len / 512) == -1) { + ret = bdrv_read(bs, (request.from + dev_offset) / 512, + data + NBD_REPLY_SIZE, + request.len / 512); + if (ret < 0) { LOG("reading from file failed"); - errno = EINVAL; - return -1; + reply.error = -ret; + request.len = 0; } *offset += request.len; @@ -666,11 +668,12 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, } else { TRACE("Writing to device"); - if (bdrv_write(bs, (request.from + dev_offset) / 512, - data, request.len / 512) == -1) { + ret = bdrv_write(bs, (request.from + dev_offset) / 512, + data, request.len / 512); + if (ret < 0) { LOG("writing to file failed"); - errno = EINVAL; - return -1; + reply.error = -ret; + request.len = 0; } *offset += request.len; -- 1.7.6