[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v17 09/14] stream: Use bdrv_drop_intermediate and dr
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v17 09/14] stream: Use bdrv_drop_intermediate and drop close_unused_images |
Date: |
Mon, 10 Mar 2014 15:26:05 +0800 |
This reuses the new bdrv_drop_intermediate.
Signed-off-by: Fam Zheng <address@hidden>
---
block/stream.c | 42 +-----------------------------------------
1 file changed, 1 insertion(+), 41 deletions(-)
diff --git a/block/stream.c b/block/stream.c
index dd0b4ac..1b348a2 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -32,7 +32,6 @@ typedef struct StreamBlockJob {
RateLimit limit;
BlockDriverState *base;
BlockdevOnError on_error;
- char backing_file_id[1024];
} StreamBlockJob;
static int coroutine_fn stream_populate(BlockDriverState *bs,
@@ -51,34 +50,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);
- }
-
- bdrv_refresh_limits(top);
-}
-
static void coroutine_fn stream_run(void *opaque)
{
StreamBlockJob *s = opaque;
@@ -184,15 +155,7 @@ wait:
ret = error;
if (!block_job_is_cancelled(&s->common) && sector_num == end && ret == 0) {
- const char *base_id = NULL, *base_fmt = NULL;
- if (base) {
- base_id = s->backing_file_id;
- if (base->drv) {
- base_fmt = base->drv->format_name;
- }
- }
- ret = bdrv_change_backing_file(bs, base_id, base_fmt);
- close_unused_images(bs, base, base_id);
+ ret = bdrv_drop_intermediate(bs, bs->backing_hd, base);
}
qemu_vfree(buf);
@@ -237,9 +200,6 @@ void stream_start(BlockDriverState *bs, BlockDriverState
*base,
}
s->base = base;
- if (base_id) {
- pstrcpy(s->backing_file_id, sizeof(s->backing_file_id), base_id);
- }
s->on_error = on_error;
s->common.co = qemu_coroutine_create(stream_run);
--
1.9.0
- [Qemu-devel] [PATCH v17 00/14] Drop in_use from BlockDriverState and enable point-in-time snapshot exporting over NBD, Fam Zheng, 2014/03/10
- [Qemu-devel] [PATCH v17 01/14] block: Add BlockOpType enum, Fam Zheng, 2014/03/10
- [Qemu-devel] [PATCH v17 02/14] block: Introduce op_blockers to BlockDriverState, Fam Zheng, 2014/03/10
- [Qemu-devel] [PATCH v17 03/14] block: Replace in_use with operation blocker, Fam Zheng, 2014/03/10
- [Qemu-devel] [PATCH v17 04/14] block: Move op_blocker check from block_job_create to its caller, Fam Zheng, 2014/03/10
- [Qemu-devel] [PATCH v17 05/14] block: Add bdrv_set_backing_hd(), Fam Zheng, 2014/03/10
- [Qemu-devel] [PATCH v17 06/14] block: Add backing_blocker in BlockDriverState, Fam Zheng, 2014/03/10
- [Qemu-devel] [PATCH v17 07/14] block: Parse "backing" option to reference existing BDS, Fam Zheng, 2014/03/10
- [Qemu-devel] [PATCH v17 08/14] block: Support dropping active in bdrv_drop_intermediate, Fam Zheng, 2014/03/10
- [Qemu-devel] [PATCH v17 09/14] stream: Use bdrv_drop_intermediate and drop close_unused_images,
Fam Zheng <=
- [Qemu-devel] [PATCH v17 10/14] qmp: Add command 'blockdev-backup', Fam Zheng, 2014/03/10
- [Qemu-devel] [PATCH v17 11/14] block: Allow backup on referenced named BlockDriverState, Fam Zheng, 2014/03/10
- [Qemu-devel] [PATCH v17 12/14] block: Add blockdev-backup to transaction, Fam Zheng, 2014/03/10
- [Qemu-devel] [PATCH v17 13/14] qemu-iotests: Test blockdev-backup in 055, Fam Zheng, 2014/03/10
- [Qemu-devel] [PATCH v17 14/14] qemu-iotests: Image fleecing test case 083, Fam Zheng, 2014/03/10