ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: Use bdrv_set_backing_hd everywhere 

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 <famz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Fam Zheng 2014-05-23 21:29:46 +08:00 committed by Stefan Hajnoczi
parent 8d24cce1e3
commit 920beae103
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block.c
View File

@ -2652,13 +2652,11 @@ int bdrv_drop_intermediate(BlockDriverState *active, BlockDriverState *top,
if (ret) { if (ret) {
goto exit; goto exit;
} }
new_top_bs->backing_hd = base_bs; bdrv_set_backing_hd(new_top_bs, base_bs);
bdrv_refresh_limits(new_top_bs);
QSIMPLEQ_FOREACH_SAFE(intermediate_state, &states_to_delete, entry, next) { QSIMPLEQ_FOREACH_SAFE(intermediate_state, &states_to_delete, entry, next) {
/* so that bdrv_close() does not recursively close the chain */ /* 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); bdrv_unref(intermediate_state->bs);
} }
ret = 0; ret = 0;

4
block/stream.c
View File

@ -60,7 +60,7 @@ static void close_unused_images(BlockDriverState *top, BlockDriverState *base,
/* Must assign before bdrv_delete() to prevent traversing dangling pointer /* Must assign before bdrv_delete() to prevent traversing dangling pointer
* while we delete backing image instances. * while we delete backing image instances.
*/ */
top->backing_hd = base; bdrv_set_backing_hd(top, base);
while (intermediate) { while (intermediate) {
BlockDriverState *unused; BlockDriverState *unused;
@ -72,7 +72,7 @@ static void close_unused_images(BlockDriverState *top, BlockDriverState *base,
unused = intermediate; unused = intermediate;
intermediate = intermediate->backing_hd; intermediate = intermediate->backing_hd;
unused->backing_hd = NULL; bdrv_set_backing_hd(unused, NULL);
bdrv_unref(unused); bdrv_unref(unused);
} }

2
block/vvfat.c
View File

@ -2947,7 +2947,7 @@ static int enable_write_target(BDRVVVFATState *s)
unlink(s->qcow_filename); unlink(s->qcow_filename);
#endif #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->drv = &vvfat_write_target;
s->bs->backing_hd->opaque = g_malloc(sizeof(void*)); s->bs->backing_hd->opaque = g_malloc(sizeof(void*));
*(void**)s->bs->backing_hd->opaque = s; *(void**)s->bs->backing_hd->opaque = s;