From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vjq2G-00026K-Eb for qemu-devel@nongnu.org; Fri, 22 Nov 2013 07:40:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vjq2A-0001O6-Dt for qemu-devel@nongnu.org; Fri, 22 Nov 2013 07:40:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:31532) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vjq2A-0001O1-00 for qemu-devel@nongnu.org; Fri, 22 Nov 2013 07:40:30 -0500 From: Paolo Bonzini Date: Fri, 22 Nov 2013 13:39:47 +0100 Message-Id: <1385124001-3576-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1385124001-3576-1-git-send-email-pbonzini@redhat.com> References: <1385124001-3576-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3 05/19] block: handle ENOTSUP from discard in generic code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pl@kamp.de, ronniesahlberg@gmail.com, stefanha@redhat.com Similar to write_zeroes, let the generic code receive a ENOTSUP for discard operations. Since bdrv_discard has advisory semantics, we can just swallow the error. Signed-off-by: Paolo Bonzini --- block.c | 2 +- block/raw-posix.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index f9674d9..b18ee6b 100644 --- a/block.c +++ b/block.c @@ -4364,7 +4364,7 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, ret = co.ret; } } - if (ret) { + if (ret && ret != -ENOTSUP) { return ret; } diff --git a/block/raw-posix.c b/block/raw-posix.c index f836c8e..cfa3162 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -323,10 +323,10 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, } #endif - s->has_discard = 1; + s->has_discard = true; #ifdef CONFIG_XFS if (platform_test_xfs_fd(s->fd)) { - s->is_xfs = 1; + s->is_xfs = true; } #endif @@ -698,8 +698,8 @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *aiocb) int ret = -EOPNOTSUPP; BDRVRawState *s = aiocb->bs->opaque; - if (s->has_discard == 0) { - return 0; + if (!s->has_discard) { + return -ENOTSUP; } if (aiocb->aio_type & QEMU_AIO_BLKDEV) { @@ -734,8 +734,8 @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *aiocb) if (ret == -ENODEV || ret == -ENOSYS || ret == -EOPNOTSUPP || ret == -ENOTTY) { - s->has_discard = 0; - ret = 0; + s->has_discard = false; + ret = -ENOTSUP; } return ret; } -- 1.8.4.2