[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 11/33] block: Use bdrv_set_backing_hd everywhere
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 11/33] block: Use bdrv_set_backing_hd everywhere |
Date: |
Wed, 28 May 2014 14:32:21 +0200 |
From: Fam Zheng <address@hidden>
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>
Signed-off-by: Stefan Hajnoczi <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.3
- [Qemu-devel] [PULL v2 01/33] qemu-iotests: Handle cache mode option in 091, (continued)
- [Qemu-devel] [PULL v2 01/33] qemu-iotests: Handle cache mode option in 091, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 02/33] QemuOpt: add unit tests, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 03/33] qcow2: Fix memory leak in COW error path, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 04/33] aio: Fix use-after-free in cancellation path, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 06/33] block: Add BlockOpType enum, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 05/33] iotests: Use _img_info in test 089, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 07/33] block: Introduce op_blockers to BlockDriverState, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 09/33] block: Move op_blocker check from block_job_create to its caller, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 08/33] block: Replace in_use with operation blocker, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 10/33] block: Add bdrv_set_backing_hd(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 11/33] block: Use bdrv_set_backing_hd everywhere,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 12/33] block: Add backing_blocker in BlockDriverState, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 13/33] block: Drop redundant bdrv_refresh_limits, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 14/33] docs: Define refcount_bits value, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 15/33] blockdev: Don't use qerror_report_err() in drive_init(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 16/33] blockdev: Don't use qerror_report() in do_drive_del(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 17/33] qemu-nbd: Don't use qerror_report(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 19/33] block/ssh: Drop superfluous libssh2_session_last_errno() calls, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 20/33] block/ssh: Propagate errors through check_host_key(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 21/33] block/ssh: Propagate errors through authenticate(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 22/33] block/ssh: Propagate errors through connect_to_ssh(), Stefan Hajnoczi, 2014/05/28