diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2015-06-17 14:55:21 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-10-16 15:34:29 +0200 |
| commit | 760e006384ecd5b8b8b1b91b5c85ff8fdcb3a21f (patch) | |
| tree | 506ef3c27944a2f97069327493f875a2def3d90a /block/mirror.c | |
| parent | b26e90f56ad3a494ee6337d2075f4dc55b62b3c6 (diff) | |
block: Convert bs->backing_hd to BdrvChild
This is the final step in converting all of the BlockDriverState
pointers that block drivers use to BdrvChild.
After this patch, bs->children contains the full list of child nodes
that are referenced by a given BDS, and these children are only
referenced through BdrvChild, so that updating the pointer in there is
enough for changing edges in the graph.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block/mirror.c')
| -rw-r--r-- | block/mirror.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/mirror.c b/block/mirror.c index 1ca4aa0da0..5d3b8bbd9c 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -371,7 +371,7 @@ static void mirror_exit(BlockJob *job, void *opaque) if (s->common.driver->job_type == BLOCK_JOB_TYPE_COMMIT) { /* drop the bs loop chain formed by the swap: break the loop then * trigger the unref from the top one */ - BlockDriverState *p = s->base->backing_hd; + BlockDriverState *p = backing_bs(s->base); bdrv_set_backing_hd(s->base, NULL); bdrv_unref(p); } @@ -431,7 +431,7 @@ static void coroutine_fn mirror_run(void *opaque) */ bdrv_get_backing_filename(s->target, backing_filename, sizeof(backing_filename)); - if (backing_filename[0] && !s->target->backing_hd) { + if (backing_filename[0] && !s->target->backing) { ret = bdrv_get_info(s->target, &bdi); if (ret < 0) { goto immediate_exit; @@ -766,7 +766,7 @@ void mirror_start(BlockDriverState *bs, BlockDriverState *target, return; } is_none_mode = mode == MIRROR_SYNC_MODE_NONE; - base = mode == MIRROR_SYNC_MODE_TOP ? bs->backing_hd : NULL; + base = mode == MIRROR_SYNC_MODE_TOP ? backing_bs(bs) : NULL; mirror_start_job(bs, target, replaces, speed, granularity, buf_size, on_source_error, on_target_error, unmap, cb, opaque, errp, |