[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 6/8] block: Use bdrv_set_backing_hd everywher
From: |
Jeff Cody |
Subject: |
Re: [Qemu-devel] [PATCH v2 6/8] block: Use bdrv_set_backing_hd everywhere |
Date: |
Fri, 23 May 2014 10:31:28 -0400 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Fri, May 23, 2014 at 09:29:46PM +0800, Fam Zheng wrote:
> We need to handle the coming backing_blocker properly, so don't open
> code the assignment, instead, call bdrv_set_backing_hd to change
> backing_hd.
>
> Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
> ---
> block.c | 6 ++----
> block/stream.c | 4 ++--
> block/vvfat.c | 2 +-
> 3 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/block.c b/block.c
> index 911ba68..1271dd2 100644
> --- a/block.c
> +++ b/block.c
> @@ -2652,13 +2652,11 @@ int bdrv_drop_intermediate(BlockDriverState *active,
> BlockDriverState *top,
> if (ret) {
> goto exit;
> }
> - new_top_bs->backing_hd = base_bs;
> -
> - bdrv_refresh_limits(new_top_bs);
> + bdrv_set_backing_hd(new_top_bs, base_bs);
>
> QSIMPLEQ_FOREACH_SAFE(intermediate_state, &states_to_delete, entry,
> next) {
> /* so that bdrv_close() does not recursively close the chain */
> - intermediate_state->bs->backing_hd = NULL;
> + bdrv_set_backing_hd(intermediate_state->bs, NULL);
> bdrv_unref(intermediate_state->bs);
> }
> ret = 0;
> diff --git a/block/stream.c b/block/stream.c
> index dd0b4ac..91d18a2 100644
> --- a/block/stream.c
> +++ b/block/stream.c
> @@ -60,7 +60,7 @@ static void close_unused_images(BlockDriverState *top,
> BlockDriverState *base,
> /* Must assign before bdrv_delete() to prevent traversing dangling
> pointer
> * while we delete backing image instances.
> */
> - top->backing_hd = base;
> + bdrv_set_backing_hd(top, base);
>
> while (intermediate) {
> BlockDriverState *unused;
> @@ -72,7 +72,7 @@ static void close_unused_images(BlockDriverState *top,
> BlockDriverState *base,
>
> unused = intermediate;
> intermediate = intermediate->backing_hd;
> - unused->backing_hd = NULL;
> + bdrv_set_backing_hd(unused, NULL);
> bdrv_unref(unused);
> }
>
> diff --git a/block/vvfat.c b/block/vvfat.c
> index c3af7ff..417e96f 100644
> --- a/block/vvfat.c
> +++ b/block/vvfat.c
> @@ -2947,7 +2947,7 @@ static int enable_write_target(BDRVVVFATState *s)
> unlink(s->qcow_filename);
> #endif
>
> - s->bs->backing_hd = bdrv_new("", &error_abort);
> + bdrv_set_backing_hd(s->bs, bdrv_new("", &error_abort));
> s->bs->backing_hd->drv = &vvfat_write_target;
> s->bs->backing_hd->opaque = g_malloc(sizeof(void*));
> *(void**)s->bs->backing_hd->opaque = s;
> --
> 1.9.2
>
- [Qemu-devel] [PATCH v2 0/8] block: Drop in_use with op blocker, Fam Zheng, 2014/05/23
- [Qemu-devel] [PATCH v2 1/8] block: Add BlockOpType enum, Fam Zheng, 2014/05/23
- [Qemu-devel] [PATCH v2 2/8] block: Introduce op_blockers to BlockDriverState, Fam Zheng, 2014/05/23
- [Qemu-devel] [PATCH v2 3/8] block: Replace in_use with operation blocker, Fam Zheng, 2014/05/23
- [Qemu-devel] [PATCH v2 4/8] block: Move op_blocker check from block_job_create to its caller, Fam Zheng, 2014/05/23
- [Qemu-devel] [PATCH v2 5/8] block: Add bdrv_set_backing_hd(), Fam Zheng, 2014/05/23
- [Qemu-devel] [PATCH v2 6/8] block: Use bdrv_set_backing_hd everywhere, Fam Zheng, 2014/05/23
- Re: [Qemu-devel] [PATCH v2 6/8] block: Use bdrv_set_backing_hd everywhere,
Jeff Cody <=
- [Qemu-devel] [PATCH v2 7/8] block: Add backing_blocker in BlockDriverState, Fam Zheng, 2014/05/23
- [Qemu-devel] [PATCH v2 8/8] block: Drop redundant bdrv_refresh_limits, Fam Zheng, 2014/05/23
- Re: [Qemu-devel] [PATCH v2 0/8] block: Drop in_use with op blocker, Stefan Hajnoczi, 2014/05/23