From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Re72p-0001Hj-Jj for qemu-devel@nongnu.org; Fri, 23 Dec 2011 10:28:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Re72T-0006V3-Cy for qemu-devel@nongnu.org; Fri, 23 Dec 2011 10:28:27 -0500 Received: from mail-gx0-f173.google.com ([209.85.161.173]:61236) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Re72S-0006Tx-PJ for qemu-devel@nongnu.org; Fri, 23 Dec 2011 10:28:04 -0500 Received: by ggnk1 with SMTP id k1so8050157ggn.4 for ; Fri, 23 Dec 2011 07:28:03 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 23 Dec 2011 16:26:10 +0100 Message-Id: <1324653990-20074-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1324653990-20074-1-git-send-email-pbonzini@redhat.com> References: <1324653990-20074-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 06/26] 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 ff701d3..5b718b5 100644 --- a/nbd.c +++ b/nbd.c @@ -595,6 +595,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."); @@ -633,12 +634,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; @@ -681,11 +683,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.7.1