From patchwork Tue Nov 19 17:07:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 292502 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 93BF52C00BA for ; Wed, 20 Nov 2013 04:09:22 +1100 (EST) Received: from localhost ([::1]:50547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vionf-0000ku-G0 for incoming@patchwork.ozlabs.org; Tue, 19 Nov 2013 12:09:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Viomb-0008QB-BL for qemu-devel@nongnu.org; Tue, 19 Nov 2013 12:08:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ViomV-0002hU-As for qemu-devel@nongnu.org; Tue, 19 Nov 2013 12:08:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9445) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViomV-0002hQ-1C for qemu-devel@nongnu.org; Tue, 19 Nov 2013 12:08:07 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAJH832O021711 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 19 Nov 2013 12:08:03 -0500 Received: from yakj.usersys.redhat.com (ovpn-112-38.ams2.redhat.com [10.36.112.38]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rAJH7jmq020928; Tue, 19 Nov 2013 12:08:01 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 19 Nov 2013 18:07:28 +0100 Message-Id: <1384880863-10434-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1384880863-10434-1-git-send-email-pbonzini@redhat.com> References: <1384880863-10434-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, pl@kamp.de, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2 05/20] block: handle ENOTSUP from discard in generic code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 f5428f4..4897649 100644 --- a/block.c +++ b/block.c @@ -4357,7 +4357,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 ace5d96..f719b69 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -324,10 +324,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 @@ -699,8 +699,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) { @@ -735,8 +735,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; }