[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/13] qcow2: Move qcow2_update_options() call up
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 06/13] qcow2: Move qcow2_update_options() call up |
Date: |
Fri, 4 Sep 2015 19:18:30 +0200 |
qcow2_update_options() only updates some variables in BDRVQcowState and
doesn't really depend on other parts of it being initialised yet, so it
can be moved so that it immediately follows the other half of option
handling code in qcow2_open().
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/qcow2.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index dc07d35..2903481 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -920,6 +920,15 @@ static int qcow2_open(BlockDriverState *bs, QDict
*options, int flags,
goto fail;
}
+ /* Enable lazy_refcounts according to image and command line options */
+ ret = qcow2_update_options(bs, opts, flags, errp);
+ if (ret < 0) {
+ goto fail;
+ }
+
+ qemu_opts_del(opts);
+ opts = NULL;
+
s->cluster_cache = g_malloc(s->cluster_size);
/* one more sector for decompressed data alignment */
s->cluster_data = qemu_try_blockalign(bs->file, QCOW_MAX_CRYPT_CLUSTERS
@@ -1004,15 +1013,6 @@ static int qcow2_open(BlockDriverState *bs, QDict
*options, int flags,
}
}
- /* Enable lazy_refcounts according to image and command line options */
- ret = qcow2_update_options(bs, opts, flags, errp);
- if (ret < 0) {
- goto fail;
- }
-
- qemu_opts_del(opts);
- opts = NULL;
-
#ifdef DEBUG_ALLOC
{
BdrvCheckResult result = {0};
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/13] qcow2: reopen: Change driver-specific runtime options, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PATCH v2 02/13] qemu-io: Remove duplicate 'open' error message, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PATCH v2 01/13] block: Allow specifying driver-specific options to reopen, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PATCH v2 03/13] qemu-io: Add command 'reopen', Kevin Wolf, 2015/09/04
- [Qemu-devel] [PATCH v2 04/13] qcow2: Improve error message, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PATCH v2 06/13] qcow2: Move qcow2_update_options() call up,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 05/13] qcow2: Factor out qcow2_update_options(), Kevin Wolf, 2015/09/04
- [Qemu-devel] [PATCH v2 07/13] qcow2: Move rest of option handling to qcow2_update_options(), Kevin Wolf, 2015/09/04
- [Qemu-devel] [PATCH v2 08/13] qcow2: Leave s unchanged on qcow2_update_options() failure, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PATCH v2 09/13] qcow2: Fix memory leak in qcow2_update_options() error path, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PATCH v2 10/13] qcow2: Make qcow2_update_options() suitable for transactions, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PATCH v2 11/13] qcow2: Support updating driver-specific options in reopen, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PATCH v2 12/13] qemu-iotests: Reopen qcow2 with lazy-refcounts change, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PATCH v2 13/13] qemu-iotests: More qcow2 reopen tests, Kevin Wolf, 2015/09/04