From patchwork Wed Sep 2 08:51:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 513401 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2B2651401C7 for ; Wed, 2 Sep 2015 18:52:58 +1000 (AEST) Received: from localhost ([::1]:35260 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX3mn-0000J7-7y for incoming@patchwork.ozlabs.org; Wed, 02 Sep 2015 04:52:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX3m3-0007VL-EG for qemu-devel@nongnu.org; Wed, 02 Sep 2015 04:52:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZX3m2-0004Sc-69 for qemu-devel@nongnu.org; Wed, 02 Sep 2015 04:52:07 -0400 Received: from [59.151.112.132] (port=26837 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX3m1-0004Bl-9R; Wed, 02 Sep 2015 04:52:06 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="100276467" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 02 Sep 2015 16:54:59 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t828pk29020274; Wed, 2 Sep 2015 16:51:46 +0800 Received: from G08FNSTD140052.g08.fujitsu.local (10.167.226.52) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Wed, 2 Sep 2015 16:51:55 +0800 From: Wen Congyang To: qemu devel , Fam Zheng , Max Reitz , Paolo Bonzini , Stefan Hajnoczi Date: Wed, 2 Sep 2015 16:51:07 +0800 Message-ID: <1441183880-26993-4-git-send-email-wency@cn.fujitsu.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1441183880-26993-1-git-send-email-wency@cn.fujitsu.com> References: <1441183880-26993-1-git-send-email-wency@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.52] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Kevin Wolf , qemu block , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , "Michael R. Hines" , Gonglei , Yang Hongyang , zhanghailiang Subject: [Qemu-devel] [PATCH 03/16] allow writing to the backing file 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 Signed-off-by: Wen Congyang Signed-off-by: zhanghailiang Signed-off-by: Gonglei --- block.c | 41 ++++++++++++++++++++++++++++++++++++++++- qapi/block-core.json | 7 ++++++- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index aeb365b..d02d9e9 100644 --- a/block.c +++ b/block.c @@ -747,6 +747,15 @@ static const BdrvChildRole child_backing = { .inherit_flags = bdrv_backing_flags, }; +static int bdrv_backing_rw_flags(int flags) +{ + return bdrv_backing_flags(flags) | BDRV_O_RDWR; +} + +static const BdrvChildRole child_backing_rw = { + .inherit_flags = bdrv_backing_rw_flags, +}; + static int bdrv_open_flags(BlockDriverState *bs, int flags) { int open_flags = flags | BDRV_O_CACHE_WB; @@ -1169,6 +1178,20 @@ out: bdrv_refresh_limits(bs, NULL); } +#define ALLOW_WRITE_BACKING_FILE "allow-write-backing-file" +static QemuOptsList backing_file_opts = { + .name = "backing_file", + .head = QTAILQ_HEAD_INITIALIZER(backing_file_opts.head), + .desc = { + { + .name = ALLOW_WRITE_BACKING_FILE, + .type = QEMU_OPT_BOOL, + .help = "allow write to backing file", + }, + { /* end of list */ } + }, +}; + /* * Opens the backing file for a BlockDriverState if not yet open * @@ -1183,6 +1206,9 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) int ret = 0; BlockDriverState *backing_hd; Error *local_err = NULL; + QemuOpts *opts = NULL; + bool child_rw = false; + const BdrvChildRole *child_role = NULL; if (bs->backing_hd != NULL) { QDECREF(options); @@ -1195,6 +1221,18 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) } bs->open_flags &= ~BDRV_O_NO_BACKING; + + opts = qemu_opts_create(&backing_file_opts, NULL, 0, &error_abort); + qemu_opts_absorb_qdict(opts, options, &local_err); + if (local_err) { + ret = -EINVAL; + error_propagate(errp, local_err); + QDECREF(options); + goto free_exit; + } + child_rw = qemu_opt_get_bool(opts, ALLOW_WRITE_BACKING_FILE, false); + child_role = child_rw ? &child_backing_rw : &child_backing; + if (qdict_haskey(options, "file.filename")) { backing_filename[0] = '\0'; } else if (bs->backing_file[0] == '\0' && qdict_size(options) == 0) { @@ -1227,7 +1265,7 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) assert(bs->backing_hd == NULL); ret = bdrv_open_inherit(&backing_hd, *backing_filename ? backing_filename : NULL, - NULL, options, 0, bs, &child_backing, + NULL, options, 0, bs, child_role, NULL, &local_err); if (ret < 0) { bdrv_unref(backing_hd); @@ -1242,6 +1280,7 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) bdrv_set_backing_hd(bs, backing_hd); free_exit: + qemu_opts_del(opts); g_free(backing_filename); return ret; } diff --git a/qapi/block-core.json b/qapi/block-core.json index 50292b9..bf141a2 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1408,6 +1408,10 @@ # @detect-zeroes: #optional detect and optimize zero writes (Since 2.1) # (default: off) # +# @allow-write-backing-file: #optional whether the backing file is opened in +# read-write mode. It is only for backing file +# (Since 2.5 default: false) +# # Since: 1.7 ## { 'struct': 'BlockdevOptionsBase', @@ -1420,7 +1424,8 @@ '*rerror': 'BlockdevOnError', '*werror': 'BlockdevOnError', '*read-only': 'bool', - '*detect-zeroes': 'BlockdevDetectZeroesOptions' } } + '*detect-zeroes': 'BlockdevDetectZeroesOptions', + '*allow-write-backing-file': 'bool' } } ## # @BlockdevOptionsFile