<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">From fd7881b0288cc731f0f0472c5fb7ea18d4959cff Mon Sep 17 00:00:00 2001
From: Jeffrey Cody &lt;jcody@redhat.com&gt;
Date: Thu, 10 Jul 2014 23:24:18 +0200
Subject: [PATCH 18/44] block: vhdx code movement - move vhdx_close() above vhdx_open()

RH-Author: Jeffrey Cody &lt;jcody@redhat.com&gt;
Message-id: &lt;9e9834ff5425b0a080a2fcdfd6ada9df1e2a1433.1405033137.git.jcody@redhat.com&gt;
Patchwork-id: 59754
O-Subject: [RHEL6-6 qemu-kvm PATCH v2 09/24] block: vhdx code movement - move vhdx_close() above vhdx_open()
Bugzilla: 1063559
RH-Acked-by: Stefan Hajnoczi &lt;stefanha@redhat.com&gt;
RH-Acked-by: Fam Zheng &lt;famz@redhat.com&gt;
RH-Acked-by: Markus Armbruster &lt;armbru@redhat.com&gt;

Signed-off-by: Jeff Cody &lt;jcody@redhat.com&gt;
Signed-off-by: Stefan Hajnoczi &lt;stefanha@redhat.com&gt;
(cherry picked from commit c46415afc2c99ea052f52f9d68ed9a78799f2c10)

Conflicts:
	block/vhdx.c

Signed-off-by: Jeff Cody &lt;jcody@redhat.com&gt;
---
 block/vhdx.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Signed-off-by: Miroslav Rezanina &lt;mrezanin@redhat.com&gt;
---
 block/vhdx.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/block/vhdx.c b/block/vhdx.c
index 5742541..5a489b6 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -794,6 +794,17 @@ exit:
 }
 
 
+static void vhdx_close(BlockDriverState *bs)
+{
+    BDRVVHDXState *s = bs-&gt;opaque;
+    qemu_vfree(s-&gt;headers[0]);
+    qemu_vfree(s-&gt;headers[1]);
+    qemu_vfree(s-&gt;bat);
+    qemu_vfree(s-&gt;parent_entries);
+    migrate_del_blocker(s-&gt;migration_blocker);
+    error_free(s-&gt;migration_blocker);
+}
+
 static int vhdx_open(BlockDriverState *bs, int flags)
 {
     BDRVVHDXState *s = bs-&gt;opaque;
@@ -1050,17 +1061,6 @@ static coroutine_fn int vhdx_co_writev(BlockDriverState *bs, int64_t sector_num,
 }
 
 
-static void vhdx_close(BlockDriverState *bs)
-{
-    BDRVVHDXState *s = bs-&gt;opaque;
-    qemu_vfree(s-&gt;headers[0]);
-    qemu_vfree(s-&gt;headers[1]);
-    qemu_vfree(s-&gt;bat);
-    qemu_vfree(s-&gt;parent_entries);
-    migrate_del_blocker(s-&gt;migration_blocker);
-    error_free(s-&gt;migration_blocker);
-}
-
 static BlockDriver bdrv_vhdx = {
     .format_name            = "vhdx",
     .instance_size          = sizeof(BDRVVHDXState),
-- 
1.7.1

</pre></body></html>