From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmdB1-0005oH-UE for qemu-devel@nongnu.org; Tue, 20 May 2014 02:05:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmdAw-0001Q7-Ms for qemu-devel@nongnu.org; Tue, 20 May 2014 02:05:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmdAw-0001Q1-Dx for qemu-devel@nongnu.org; Tue, 20 May 2014 02:05:22 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4K65Lja011539 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 May 2014 02:05:21 -0400 From: Fam Zheng Date: Tue, 20 May 2014 14:04:34 +0800 Message-Id: <1400565880-13409-10-git-send-email-famz@redhat.com> In-Reply-To: <1400565880-13409-1-git-send-email-famz@redhat.com> References: <1400565880-13409-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v20 09/15] stream: Use bdrv_drop_intermediate and drop close_unused_images List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jcody@redhat.com, hbrock@redhat.com, rjones@redhat.com, armbru@redhat.com, imain@redhat.com, stefanha@redhat.com, pbonzini@redhat.com This reuses the new bdrv_drop_intermediate. Signed-off-by: Fam Zheng --- 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.2