[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 05/10] stream: Use bdrv_drop_intermediate and dro
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v6 05/10] stream: Use bdrv_drop_intermediate and drop close_unused_images |
Date: |
Thu, 28 Nov 2013 16:39:37 +0800 |
This reuses the new bdrv_drop_intermediate.
Signed-off-by: Fam Zheng <address@hidden>
---
block/stream.c | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
diff --git a/block/stream.c b/block/stream.c
index 694fd42..76bb4b8 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -51,32 +51,6 @@ static int coroutine_fn stream_populate(BlockDriverState *bs,
return bdrv_co_copy_on_readv(bs, sector_num, nb_sectors, &qiov);
}
-static void close_unused_images(BlockDriverState *top, BlockDriverState *base,
- const char *base_id)
-{
- BlockDriverState *intermediate;
- intermediate = top->backing_hd;
-
- /* Must assign before bdrv_delete() to prevent traversing dangling pointer
- * while we delete backing image instances.
- */
- top->backing_hd = base;
-
- while (intermediate) {
- BlockDriverState *unused;
-
- /* reached base */
- if (intermediate == base) {
- break;
- }
-
- unused = intermediate;
- intermediate = intermediate->backing_hd;
- unused->backing_hd = NULL;
- bdrv_unref(unused);
- }
-}
-
static void coroutine_fn stream_run(void *opaque)
{
StreamBlockJob *s = opaque;
@@ -185,7 +159,7 @@ wait:
}
}
ret = bdrv_change_backing_file(bs, base_id, base_fmt);
- close_unused_images(bs, base, base_id);
+ bdrv_drop_intermediate(bs, bs->backing_hd, base);
}
qemu_vfree(buf);
--
1.8.4.2
- [Qemu-devel] [PATCH v6 00/10] Drop in_use from BlockDriverState and enable point-in-time snapshot exporting over NBD, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 01/10] qapi: Add BlockOperationType enum, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 02/10] block: Introduce op_blockers to BlockDriverState, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 03/10] block: Parse "backing" option to reference existing BDS, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 04/10] block: support dropping active in bdrv_drop_intermediate, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 05/10] stream: Use bdrv_drop_intermediate and drop close_unused_images,
Fam Zheng <=
- [Qemu-devel] [PATCH v6 06/10] block: Replace in_use with operation blocker, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 07/10] block: Pass error in bdrv_snapshot_create, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 08/10] block: Add checks of blocker in block operations, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 10/10] block: Allow backup on referenced named BlockDriverState, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 09/10] qmp: add command 'blockdev-backup', Fam Zheng, 2013/11/28