[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH COLO v4 02/15] allow writing to the backing file
From: |
Gonglei |
Subject: |
Re: [Qemu-devel] [PATCH COLO v4 02/15] allow writing to the backing file |
Date: |
Thu, 14 May 2015 15:16:51 +0800 |
User-agent: |
Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 |
On 2015/5/8 17:15, Wen Congyang wrote:
> Signed-off-by: Wen Congyang <address@hidden>
> Signed-off-by: zhanghailiang <address@hidden>
> Signed-off-by: Gonglei <address@hidden>
> ---
> 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;
Oh, This will leak memory which local variable local_err pointed.
Besides, do we need to propagate the error info?
Regards,
-Gonglei
> + }
> + 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;
>
- [Qemu-devel] [PATCH COLO v4 00/15] Block replication for continuous checkpoints, Wen Congyang, 2015/05/08
- [Qemu-devel] [PATCH COLO v4 07/15] Add new block driver interface to connect/disconnect the remote target, Wen Congyang, 2015/05/08
- [Qemu-devel] [PATCH COLO v4 03/15] Allow creating backup jobs when opening BDS, Wen Congyang, 2015/05/08
- [Qemu-devel] [PATCH COLO v4 05/15] Backup: clear all bitmap when doing block checkpoint, Wen Congyang, 2015/05/08
- [Qemu-devel] [PATCH COLO v4 02/15] allow writing to the backing file, Wen Congyang, 2015/05/08
- Re: [Qemu-devel] [PATCH COLO v4 02/15] allow writing to the backing file,
Gonglei <=
- [Qemu-devel] [PATCH COLO v4 01/15] docs: block replication's description, Wen Congyang, 2015/05/08
- Re: [Qemu-devel] [PATCH COLO v4 01/15] docs: block replication's description, Dr. David Alan Gilbert, 2015/05/14
- Re: [Qemu-devel] [PATCH COLO v4 01/15] docs: block replication's description, Wen Congyang, 2015/05/14
- Re: [Qemu-devel] [PATCH COLO v4 01/15] docs: block replication's description, Dr. David Alan Gilbert, 2015/05/14
- Re: [Qemu-devel] [PATCH COLO v4 01/15] docs: block replication's description, Andrey Korolyov, 2015/05/20
- Re: [Qemu-devel] [PATCH COLO v4 01/15] docs: block replication's description, Wen Congyang, 2015/05/21
- Re: [Qemu-devel] [PATCH COLO v4 01/15] docs: block replication's description, Andrey Korolyov, 2015/05/21
[Qemu-devel] [PATCH COLO v4 06/15] Don't allow a disk use backing reference target, Wen Congyang, 2015/05/08
[Qemu-devel] [PATCH COLO v4 04/15] block: Parse "backing_reference" option to reference existing BDS, Wen Congyang, 2015/05/08