qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Wen Congyang <wency@cn.fujitsu.com>
To: qemu devel <qemu-devel@nongnu.org>, Fam Zheng <famz@redhat.com>,
	Max Reitz <mreitz@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, qemu block <qemu-block@nongnu.org>,
	Lai Jiangshan <laijs@cn.fujitsu.com>,
	Jiang Yunhong <yunhong.jiang@intel.com>,
	Dong Eddie <eddie.dong@intel.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	Gonglei <arei.gonglei@huawei.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Yang Hongyang <yanghy@cn.fujitsu.com>,
	zhanghailiang <zhang.zhanghailiang@huawei.com>
Subject: [Qemu-devel] [PATCH COLO v4 02/15] allow writing to the backing file
Date: Fri, 8 May 2015 17:15:54 +0800	[thread overview]
Message-ID: <1431076567-30371-3-git-send-email-wency@cn.fujitsu.com> (raw)
In-Reply-To: <1431076567-30371-1-git-send-email-wency@cn.fujitsu.com>

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
---
 block.c | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/block.c b/block.c
index 49d472f..8fa4f05 100644
--- a/block.c
+++ b/block.c
@@ -1051,6 +1051,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
  *
@@ -1065,6 +1079,8 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)
     int ret = 0;
     BlockDriverState *backing_hd;
     Error *local_err = NULL;
+    QemuOpts *opts = NULL;
+    int flags;
 
     if (bs->backing_hd != NULL) {
         QDECREF(options);
@@ -1077,6 +1093,19 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)
     }
 
     bs->open_flags &= ~BDRV_O_NO_BACKING;
+    flags = bdrv_backing_flags(bs->open_flags);
+
+    opts = qemu_opts_create(&backing_file_opts, NULL, 0, &error_abort);
+    qemu_opts_absorb_qdict(opts, options, &local_err);
+    if (local_err) {
+        ret = -EINVAL;
+        goto free_exit;
+    }
+    if (qemu_opt_get_bool(opts, ALLOW_WRITE_BACKING_FILE, false)) {
+        flags |= BDRV_O_RDWR;
+    }
+    qemu_opts_del(opts);
+
     if (qdict_haskey(options, "file.filename")) {
         backing_filename[0] = '\0';
     } else if (bs->backing_file[0] == '\0' && qdict_size(options) == 0) {
@@ -1109,7 +1138,7 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)
     assert(bs->backing_hd == NULL);
     ret = bdrv_open(&backing_hd,
                     *backing_filename ? backing_filename : NULL, NULL, options,
-                    bdrv_backing_flags(bs->open_flags), NULL, &local_err);
+                    flags, NULL, &local_err);
     if (ret < 0) {
         bdrv_unref(backing_hd);
         backing_hd = NULL;
-- 
2.1.0

  parent reply	other threads:[~2015-05-08  9:12 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-08  9:15 [Qemu-devel] [PATCH COLO v4 00/15] Block replication for continuous checkpoints Wen Congyang
2015-05-08  9:15 ` [Qemu-devel] [PATCH COLO v4 01/15] docs: block replication's description Wen Congyang
2015-05-14 11:19   ` Dr. David Alan Gilbert
2015-05-14 14:00     ` Wen Congyang
2015-05-14 15:38       ` Dr. David Alan Gilbert
2015-05-20 16:31         ` Andrey Korolyov
2015-05-21  8:35           ` Wen Congyang
2015-05-21 11:43             ` Andrey Korolyov
2015-05-08  9:15 ` Wen Congyang [this message]
2015-05-14  7:16   ` [Qemu-devel] [PATCH COLO v4 02/15] allow writing to the backing file Gonglei
2015-05-14  7:32     ` Wen Congyang
2015-05-08  9:15 ` [Qemu-devel] [PATCH COLO v4 03/15] Allow creating backup jobs when opening BDS Wen Congyang
2015-05-08  9:15 ` [Qemu-devel] [PATCH COLO v4 04/15] block: Parse "backing_reference" option to reference existing BDS Wen Congyang
2015-05-08  9:15 ` [Qemu-devel] [PATCH COLO v4 05/15] Backup: clear all bitmap when doing block checkpoint Wen Congyang
2015-05-08  9:15 ` [Qemu-devel] [PATCH COLO v4 06/15] Don't allow a disk use backing reference target Wen Congyang
2015-05-08  9:15 ` [Qemu-devel] [PATCH COLO v4 07/15] Add new block driver interface to connect/disconnect the remote target Wen Congyang
2015-05-08  9:16 ` [Qemu-devel] [PATCH COLO v4 08/15] NBD client: implement block driver interfaces to connect/disconnect NBD server Wen Congyang
2015-05-14  8:16   ` Gonglei
2015-05-14  8:41     ` Wen Congyang
2015-05-08  9:16 ` [Qemu-devel] [PATCH COLO v4 09/15] Introduce a new -drive option to control whether to connect to remote target Wen Congyang
2015-05-08  9:16 ` [Qemu-devel] [PATCH COLO v4 10/15] NBD client: connect to nbd server later Wen Congyang
2015-05-08  9:16 ` [Qemu-devel] [PATCH COLO v4 11/15] Add new block driver interfaces to control block replication Wen Congyang
2015-05-08  9:16 ` [Qemu-devel] [PATCH COLO v4 12/15] skip nbd_target when starting " Wen Congyang
2015-05-08  9:16 ` [Qemu-devel] [PATCH COLO v4 13/15] quorum: implement block driver interfaces for " Wen Congyang
2015-05-08  9:16 ` [Qemu-devel] [PATCH COLO v4 14/15] quorum: allow ignoring child errors Wen Congyang
2015-05-08  9:16 ` [Qemu-devel] [PATCH COLO v4 15/15] Implement new driver for block replication Wen Congyang
2015-05-14  9:18   ` Gonglei
2015-05-20 19:18 ` [Qemu-devel] [PATCH COLO v4 00/15] Block replication for continuous checkpoints Dr. David Alan Gilbert
2015-05-21  0:50   ` Wen Congyang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1431076567-30371-3-git-send-email-wency@cn.fujitsu.com \
    --to=wency@cn.fujitsu.com \
    --cc=arei.gonglei@huawei.com \
    --cc=dgilbert@redhat.com \
    --cc=eddie.dong@intel.com \
    --cc=famz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=laijs@cn.fujitsu.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=yanghy@cn.fujitsu.com \
    --cc=yunhong.jiang@intel.com \
    --cc=zhang.zhanghailiang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).