diff options
| author | Fam Zheng | 2014-05-23 15:29:46 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2014-05-28 14:28:46 +0200 |
| commit | 920beae1037dc7d98cd876da8c83b402234c7dba (patch) | |
| tree | c3887a25b74b5b769911376bc588a819f857ee09 /block | |
| parent | block: Add bdrv_set_backing_hd() (diff) | |
| download | qemu-920beae1037dc7d98cd876da8c83b402234c7dba.tar.gz qemu-920beae1037dc7d98cd876da8c83b402234c7dba.tar.xz qemu-920beae1037dc7d98cd876da8c83b402234c7dba.zip | |
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/stream.c | 4 | ||||
| -rw-r--r-- | block/vvfat.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/block/stream.c b/block/stream.c index dd0b4ac3d2..91d18a2db7 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 c3af7ff4c5..417e96fe9b 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; |