From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaUCO-0003tC-Qy for qemu-devel@nongnu.org; Fri, 11 Sep 2015 15:41:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaUCN-0005FU-WD for qemu-devel@nongnu.org; Fri, 11 Sep 2015 15:41:28 -0400 From: Kevin Wolf Date: Fri, 11 Sep 2015 21:40:52 +0200 Message-Id: <1442000463-22777-13-git-send-email-kwolf@redhat.com> In-Reply-To: <1442000463-22777-1-git-send-email-kwolf@redhat.com> References: <1442000463-22777-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 12/23] qcow2: Move qcow2_update_options() call up List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 Reviewed-by: Eric Blake Reviewed-by: Max Reitz --- block/qcow2.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 4dd0699..be6b3c2 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -979,6 +979,15 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, s->cache_clean_interval = cache_clean_interval; cache_clean_timer_init(bs, bdrv_get_aio_context(bs)); + /* 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 @@ -1063,15 +1072,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