[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v20 07/15] block: Parse "backing" option to referenc
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v20 07/15] block: Parse "backing" option to reference existing BDS |
Date: |
Tue, 20 May 2014 14:04:32 +0800 |
Now it's safe to allow reference for backing_hd in the interface.
Signed-off-by: Fam Zheng <address@hidden>
---
block.c | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index efec10a..4fc2dd7 100644
--- a/block.c
+++ b/block.c
@@ -1445,12 +1445,35 @@ int bdrv_open(BlockDriverState **pbs, const char
*filename,
/* If there is a backing file, use it */
if ((flags & BDRV_O_NO_BACKING) == 0) {
QDict *backing_options;
+ const char *backing_name;
+ BlockDriverState *backing_hd;
+ backing_name = qdict_get_try_str(options, "backing");
qdict_extract_subqdict(options, &backing_options, "backing.");
- ret = bdrv_open_backing_file(bs, backing_options, &local_err);
- if (ret < 0) {
+
+ if (backing_name && qdict_size(backing_options)) {
+ error_setg(&local_err,
+ "Option \"backing\" and \"backing.*\" cannot be "
+ "used together");
+ ret = -EINVAL;
goto close_and_fail;
}
+ if (backing_name) {
+ backing_hd = bdrv_find(backing_name);
+ if (!backing_hd) {
+ error_set(&local_err, QERR_DEVICE_NOT_FOUND, backing_name);
+ ret = -ENOENT;
+ goto close_and_fail;
+ }
+ qdict_del(options, "backing");
+ bdrv_set_backing_hd(bs, backing_hd);
+ bdrv_ref(backing_hd);
+ } else {
+ ret = bdrv_open_backing_file(bs, backing_options, &local_err);
+ if (ret < 0) {
+ goto close_and_fail;
+ }
+ }
}
/* For snapshot=on, create a temporary qcow2 overlay. bs points to the
--
1.9.2
- Re: [Qemu-devel] [PATCH v20 04/15] block: Move op_blocker check from block_job_create to its caller, (continued)
- Re: [Qemu-devel] [PATCH v20 04/15] block: Move op_blocker check from block_job_create to its caller, Fam Zheng, 2014/05/20
- Re: [Qemu-devel] [PATCH v20 04/15] block: Move op_blocker check from block_job_create to its caller, Jeff Cody, 2014/05/21
- Re: [Qemu-devel] [PATCH v20 04/15] block: Move op_blocker check from block_job_create to its caller, Fam Zheng, 2014/05/21
- Re: [Qemu-devel] [PATCH v20 04/15] block: Move op_blocker check from block_job_create to its caller, Stefan Hajnoczi, 2014/05/21
- Re: [Qemu-devel] [PATCH v20 04/15] block: Move op_blocker check from block_job_create to its caller, Jeff Cody, 2014/05/21
- Re: [Qemu-devel] [PATCH v20 04/15] block: Move op_blocker check from block_job_create to its caller, Jeff Cody, 2014/05/21
Re: [Qemu-devel] [PATCH v20 04/15] block: Move op_blocker check from block_job_create to its caller, Stefan Hajnoczi, 2014/05/21
[Qemu-devel] [PATCH v20 05/15] block: Add bdrv_set_backing_hd(), Fam Zheng, 2014/05/20
[Qemu-devel] [PATCH v20 07/15] block: Parse "backing" option to reference existing BDS,
Fam Zheng <=
[Qemu-devel] [PATCH v20 06/15] block: Add backing_blocker in BlockDriverState, Fam Zheng, 2014/05/20
Re: [Qemu-devel] [PATCH v20 06/15] block: Add backing_blocker in BlockDriverState, Stefan Hajnoczi, 2014/05/21
[Qemu-devel] [PATCH v20 08/15] block: Support dropping active in bdrv_drop_intermediate, Fam Zheng, 2014/05/20
[Qemu-devel] [PATCH v20 09/15] stream: Use bdrv_drop_intermediate and drop close_unused_images, Fam Zheng, 2014/05/20
[Qemu-devel] [PATCH v20 10/15] commit: Use bdrv_drop_intermediate, Fam Zheng, 2014/05/20