[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] block: Use bdrv_set_backing_hd everywhere
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH 6/7] block: Use bdrv_set_backing_hd everywhere |
Date: |
Fri, 23 May 2014 11:23:22 +0800 |
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>
---
block.c | 4 ++--
block/stream.c | 4 ++--
block/vvfat.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/block.c b/block.c
index 911ba68..91c866c 100644
--- a/block.c
+++ b/block.c
@@ -2652,13 +2652,13 @@ int bdrv_drop_intermediate(BlockDriverState *active,
BlockDriverState *top,
if (ret) {
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) {
/* 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 0/7] block: Drop in_use with op blocker, Fam Zheng, 2014/05/22
- [Qemu-devel] [PATCH 1/7] block: Add BlockOpType enum, Fam Zheng, 2014/05/22
- [Qemu-devel] [PATCH 2/7] block: Introduce op_blockers to BlockDriverState, Fam Zheng, 2014/05/22
- [Qemu-devel] [PATCH 3/7] block: Replace in_use with operation blocker, Fam Zheng, 2014/05/22
- [Qemu-devel] [PATCH 4/7] block: Move op_blocker check from block_job_create to its caller, Fam Zheng, 2014/05/22
- [Qemu-devel] [PATCH 5/7] block: Add bdrv_set_backing_hd(), Fam Zheng, 2014/05/22
- [Qemu-devel] [PATCH 6/7] block: Use bdrv_set_backing_hd everywhere,
Fam Zheng <=
- [Qemu-devel] [PATCH 7/7] block: Add backing_blocker in BlockDriverState, Fam Zheng, 2014/05/22