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>,
Stefan Hajnoczi <stefanha@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, qemu block <qemu-block@nongnu.org>,
Jiang Yunhong <yunhong.jiang@intel.com>,
Dong Eddie <eddie.dong@intel.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Michael R. Hines" <mrhines@linux.vnet.ibm.com>,
Gonglei <arei.gonglei@huawei.com>,
Yang Hongyang <yanghy@cn.fujitsu.com>,
zhanghailiang <zhang.zhanghailiang@huawei.com>
Subject: [Qemu-devel] [PATCH 04/16] block: Allow references for backing files
Date: Wed, 2 Sep 2015 16:51:08 +0800 [thread overview]
Message-ID: <1441183880-26993-5-git-send-email-wency@cn.fujitsu.com> (raw)
In-Reply-To: <1441183880-26993-1-git-send-email-wency@cn.fujitsu.com>
Usage:
-drive file=xxx,id=Y, \
-drive file=xxxx,id=X,backing.backing_reference=Y
It will create such backing chain:
{virtio-blk dev 'Y'} {virtio-blk dev 'X'}
| |
| |
v v
[base] <- [mid] <- ( Y ) <----------------- ( X )
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 | 39 +++++++++++++++++++++++++++++++++++----
include/block/block.h | 1 +
2 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index d02d9e9..f93c50d 100644
--- a/block.c
+++ b/block.c
@@ -1179,6 +1179,7 @@ out:
}
#define ALLOW_WRITE_BACKING_FILE "allow-write-backing-file"
+#define BACKING_REFERENCE "backing_reference"
static QemuOptsList backing_file_opts = {
.name = "backing_file",
.head = QTAILQ_HEAD_INITIALIZER(backing_file_opts.head),
@@ -1188,6 +1189,11 @@ static QemuOptsList backing_file_opts = {
.type = QEMU_OPT_BOOL,
.help = "allow write to backing file",
},
+ {
+ .name = BACKING_REFERENCE,
+ .type = QEMU_OPT_STRING,
+ .help = "reference to the exsiting BDS",
+ },
{ /* end of list */ }
},
};
@@ -1204,11 +1210,12 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)
{
char *backing_filename = g_malloc0(PATH_MAX);
int ret = 0;
- BlockDriverState *backing_hd;
+ BlockDriverState *backing_hd = NULL;
Error *local_err = NULL;
QemuOpts *opts = NULL;
bool child_rw = false;
const BdrvChildRole *child_role = NULL;
+ const char *reference = NULL;
if (bs->backing_hd != NULL) {
QDECREF(options);
@@ -1231,9 +1238,10 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)
goto free_exit;
}
child_rw = qemu_opt_get_bool(opts, ALLOW_WRITE_BACKING_FILE, false);
+ reference = qemu_opt_get(opts, BACKING_REFERENCE);
child_role = child_rw ? &child_backing_rw : &child_backing;
- if (qdict_haskey(options, "file.filename")) {
+ if (qdict_haskey(options, "file.filename") || reference) {
backing_filename[0] = '\0';
} else if (bs->backing_file[0] == '\0' && qdict_size(options) == 0) {
QDECREF(options);
@@ -1256,7 +1264,9 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)
goto free_exit;
}
- backing_hd = bdrv_new();
+ if (!reference) {
+ backing_hd = bdrv_new();
+ }
if (bs->backing_format[0] != '\0' && !qdict_haskey(options, "driver")) {
qdict_put(options, "driver", qstring_from_str(bs->backing_format));
@@ -1265,7 +1275,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_role,
+ reference, options, 0, bs, child_role,
NULL, &local_err);
if (ret < 0) {
bdrv_unref(backing_hd);
@@ -1276,6 +1286,19 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)
error_free(local_err);
goto free_exit;
}
+ if (reference) {
+ if (bdrv_op_is_blocked(backing_hd, BLOCK_OP_TYPE_BACKING_REFERENCE,
+ errp)) {
+ ret = -EBUSY;
+ goto free_reference_exit;
+ }
+ if (backing_hd->blk && blk_disable_attach_dev(backing_hd->blk)) {
+ error_setg(errp, "backing_hd %s is used by the other device model",
+ reference);
+ ret = -EBUSY;
+ goto free_reference_exit;
+ }
+ }
bdrv_set_backing_hd(bs, backing_hd);
@@ -1283,6 +1306,11 @@ free_exit:
qemu_opts_del(opts);
g_free(backing_filename);
return ret;
+
+free_reference_exit:
+ bdrv_unref(backing_hd);
+ bs->open_flags |= BDRV_O_NO_BACKING;
+ goto free_exit;
}
/*
@@ -1947,6 +1975,9 @@ void bdrv_close(BlockDriverState *bs)
if (bs->backing_hd) {
BlockDriverState *backing_hd = bs->backing_hd;
bdrv_set_backing_hd(bs, NULL);
+ if (backing_hd->blk) {
+ blk_enable_attach_dev(backing_hd->blk);
+ }
bdrv_unref(backing_hd);
}
diff --git a/include/block/block.h b/include/block/block.h
index 612dcad..5812716 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -170,6 +170,7 @@ typedef enum BlockOpType {
BLOCK_OP_TYPE_RESIZE,
BLOCK_OP_TYPE_STREAM,
BLOCK_OP_TYPE_REPLACE,
+ BLOCK_OP_TYPE_BACKING_REFERENCE,
BLOCK_OP_TYPE_MAX,
} BlockOpType;
--
2.4.3
next prev parent reply other threads:[~2015-09-02 8:52 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-02 8:51 [Qemu-devel] [PATCH 00/16] Block replication for continuous checkpoints Wen Congyang
2015-09-02 8:51 ` [Qemu-devel] [PATCH 01/16] introduce a new API to enable/disable attach device model Wen Congyang
2015-09-02 15:37 ` Eric Blake
2015-09-07 1:27 ` Wen Congyang
2015-09-02 8:51 ` [Qemu-devel] [PATCH 02/16] introduce a new API to check if blk is attached Wen Congyang
2015-09-02 15:40 ` Eric Blake
2015-09-02 8:51 ` [Qemu-devel] [PATCH 03/16] allow writing to the backing file Wen Congyang
2015-09-02 16:06 ` Eric Blake
2015-09-09 9:19 ` Wen Congyang
2015-09-02 8:51 ` Wen Congyang [this message]
2015-09-02 18:50 ` [Qemu-devel] [PATCH 04/16] block: Allow references for backing files Eric Blake
2015-09-09 8:51 ` Wen Congyang
2015-09-02 8:51 ` [Qemu-devel] [PATCH 05/16] introduce a new API qemu_opts_absorb_qdict_by_index() Wen Congyang
2015-09-02 19:01 ` Eric Blake
2015-09-07 2:18 ` Wen Congyang
2015-09-02 8:51 ` [Qemu-devel] [PATCH 06/16] quorum: allow ignoring child errors Wen Congyang
2015-09-02 16:30 ` Eric Blake
2015-09-07 3:40 ` Wen Congyang
2015-09-07 16:56 ` Dr. David Alan Gilbert
2015-09-08 0:46 ` Wen Congyang
2015-09-02 8:51 ` [Qemu-devel] [PATCH 07/16] Backup: clear all bitmap when doing block checkpoint Wen Congyang
2015-09-02 14:10 ` Jeff Cody
2015-09-02 8:51 ` [Qemu-devel] [PATCH 08/16] block: make bdrv_put_ref_bh_schedule() as a public API Wen Congyang
2015-09-02 8:51 ` [Qemu-devel] [PATCH 09/16] Allow creating backup jobs when opening BDS Wen Congyang
2015-09-02 14:12 ` Jeff Cody
2015-09-02 8:51 ` [Qemu-devel] [PATCH 10/16] docs: block replication's description Wen Congyang
2015-09-02 20:41 ` Eric Blake
2015-09-09 8:22 ` Wen Congyang
2015-09-02 8:51 ` [Qemu-devel] [PATCH 11/16] Add new block driver interfaces to control block replication Wen Congyang
2015-09-02 16:33 ` Eric Blake
2015-09-09 9:24 ` Wen Congyang
2015-09-25 6:14 ` Wen Congyang
2015-09-02 8:51 ` [Qemu-devel] [PATCH 12/16] skip nbd_target when starting " Wen Congyang
2015-09-02 8:51 ` [Qemu-devel] [PATCH 13/16] quorum: implement block driver interfaces for " Wen Congyang
2015-09-02 8:51 ` [Qemu-devel] [PATCH 14/16] Implement new driver " Wen Congyang
2015-09-02 8:51 ` [Qemu-devel] [PATCH 15/16] support replication driver in blockdev-add Wen Congyang
2015-09-02 16:36 ` Eric Blake
2015-09-09 8:27 ` Wen Congyang
2015-09-02 8:51 ` [Qemu-devel] [PATCH 16/16] Add a new API to start/stop replication, do checkpoint to all BDSes 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=1441183880-26993-5-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=mreitz@redhat.com \
--cc=mrhines@linux.vnet.ibm.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).