From patchwork Tue Mar 29 13:30:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 8687041 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 65AD89F36E for ; Tue, 29 Mar 2016 13:31:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C783520251 for ; Tue, 29 Mar 2016 13:31:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4A764200E7 for ; Tue, 29 Mar 2016 13:31:26 +0000 (UTC) Received: from localhost ([::1]:46787 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aktjx-0008Lv-8N for patchwork-qemu-devel@patchwork.kernel.org; Tue, 29 Mar 2016 09:31:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aktjl-0008Ic-6Y for qemu-devel@nongnu.org; Tue, 29 Mar 2016 09:31:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aktjh-0006rv-2G for qemu-devel@nongnu.org; Tue, 29 Mar 2016 09:31:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36148) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aktja-0006pB-Pq; Tue, 29 Mar 2016 09:31:02 -0400 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 (Postfix) with ESMTPS id 73D687AE83; Tue, 29 Mar 2016 13:31:02 +0000 (UTC) Received: from noname.redhat.com (ovpn-116-120.ams2.redhat.com [10.36.116.120]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2TDUwBl009899; Tue, 29 Mar 2016 09:31:01 -0400 From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 29 Mar 2016 15:30:38 +0200 Message-Id: <1459258257-17767-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1459258257-17767-1-git-send-email-kwolf@redhat.com> References: <1459258257-17767-1-git-send-email-kwolf@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, qemu-devel@nongnu.org, mreitz@redhat.com Subject: [Qemu-devel] [PATCH v2 01/20] block: Add bdrv_parse_cache_mode() 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's like bdrv_parse_cache_flags(), except that writethrough mode isn't included in the flags, but returned as a separate bool. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block.c | 17 +++++++++++++++++ include/block/block.h | 1 + 2 files changed, 18 insertions(+) diff --git a/block.c b/block.c index 58acfda..33dc46c 100644 --- a/block.c +++ b/block.c @@ -666,6 +666,23 @@ int bdrv_parse_cache_flags(const char *mode, int *flags) return 0; } +int bdrv_parse_cache_mode(const char *mode, int *flags, bool *writethrough) +{ + int ret = bdrv_parse_cache_flags(mode, flags); + if (ret < 0) { + return ret; + } + + if (*flags & BDRV_O_CACHE_WB) { + *flags &= ~BDRV_O_CACHE_WB; + *writethrough = false; + } else { + *writethrough = true; + } + + return 0; +} + /* * Returns the options and flags that a temporary snapshot should get, based on * the originally requested flags (the originally requested image will have diff --git a/include/block/block.h b/include/block/block.h index 26ad002..8d9bf2f 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -208,6 +208,7 @@ void bdrv_replace_in_backing_chain(BlockDriverState *old, BlockDriverState *new); int bdrv_parse_cache_flags(const char *mode, int *flags); +int bdrv_parse_cache_mode(const char *mode, int *flags, bool *writethrough); int bdrv_parse_discard_flags(const char *mode, int *flags); BdrvChild *bdrv_open_child(const char *filename, QDict *options, const char *bdref_key,