[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 24/36] block: vhdx code movement - move vhdx_close()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 24/36] block: vhdx code movement - move vhdx_close() above vhdx_open() |
Date: |
Thu, 7 Nov 2013 14:12:32 +0100 |
From: Jeff Cody <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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
- [Qemu-devel] [PULL 12/36] libqtest: rename qmp() to qmp_discard_response(), (continued)
- [Qemu-devel] [PULL 12/36] libqtest: rename qmp() to qmp_discard_response(), Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 13/36] libqtest: add qmp(fmt, ...) -> QDict* function, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 01/36] qapi: Fix comment for create-type to match code., Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 05/36] block: qemu-iotests, fix _make_test_img() to work with spaced pathnames, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 26/36] block: vhdx - add region overlap detection for image files, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 22/36] block: vhdx - break endian translation functions out, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 33/36] block: vhdx - add .bdrv_create() support, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 25/36] block: vhdx - log parsing, replay, and flush support, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 29/36] block: vhdx - remove BAT file offset bit shifting, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 27/36] block: vhdx - add log write support, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 24/36] block: vhdx code movement - move vhdx_close() above vhdx_open(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 19/36] block: vhdx - add header update capability., Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 21/36] block: vhdx - log support struct and defines, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 23/36] block: vhdx - update log guid in header, and first write tracker, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 02/36] qemu-iotests: Filter out actual image size in 067, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 30/36] block: vhdx - move more endian translations to vhdx-endian.c, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 31/36] block: vhdx - break out code operations to functions, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 32/36] block: vhdx - fix comment typos in header, fix incorrect struct fields, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 36/36] block: vhdx qemu-iotest - log replay of data sector, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 18/36] block: vhdx - minor comments and typo correction., Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 06/36] block: qemu-iotests, add quotes to $TEST_IMG.base usage in 017, Stefan Hajnoczi, 2013/11/07