From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51795) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VePQX-0007nW-Nr for qemu-devel@nongnu.org; Thu, 07 Nov 2013 08:15:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VePQR-0006yL-M3 for qemu-devel@nongnu.org; Thu, 07 Nov 2013 08:15:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VePQR-0006xs-Ez for qemu-devel@nongnu.org; Thu, 07 Nov 2013 08:15:07 -0500 From: Stefan Hajnoczi Date: Thu, 7 Nov 2013 14:12:32 +0100 Message-Id: <1383829964-32364-25-git-send-email-stefanha@redhat.com> In-Reply-To: <1383829964-32364-1-git-send-email-stefanha@redhat.com> References: <1383829964-32364-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 24/36] block: vhdx code movement - move vhdx_close() above vhdx_open() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jeff Cody , Stefan Hajnoczi , Anthony Liguori From: Jeff Cody Signed-off-by: Jeff Cody Signed-off-by: Stefan Hajnoczi --- block/vhdx.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/block/vhdx.c b/block/vhdx.c index 241703a..3f06ce3 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -778,6 +778,17 @@ exit: } +static void vhdx_close(BlockDriverState *bs) +{ + BDRVVHDXState *s = bs->opaque; + qemu_vfree(s->headers[0]); + qemu_vfree(s->headers[1]); + qemu_vfree(s->bat); + qemu_vfree(s->parent_entries); + migrate_del_blocker(s->migration_blocker); + error_free(s->migration_blocker); +} + static int vhdx_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { @@ -1035,17 +1046,6 @@ static coroutine_fn int vhdx_co_writev(BlockDriverState *bs, int64_t sector_num, } -static void vhdx_close(BlockDriverState *bs) -{ - BDRVVHDXState *s = bs->opaque; - qemu_vfree(s->headers[0]); - qemu_vfree(s->headers[1]); - qemu_vfree(s->bat); - qemu_vfree(s->parent_entries); - migrate_del_blocker(s->migration_blocker); - error_free(s->migration_blocker); -} - static BlockDriver bdrv_vhdx = { .format_name = "vhdx", .instance_size = sizeof(BDRVVHDXState), -- 1.8.3.1