From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52502)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1YsUna-0005nU-38
	for qemu-devel@nongnu.org; Wed, 13 May 2015 07:26:02 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1YsUnV-0005N0-Rz
	for qemu-devel@nongnu.org; Wed, 13 May 2015 07:26:02 -0400
Message-ID: <555334C0.4050004@redhat.com>
Date: Wed, 13 May 2015 13:25:52 +0200
From: Max Reitz <mreitz@redhat.com>
MIME-Version: 1.0
References: <1431105726-3682-1-git-send-email-kwolf@redhat.com>
	<1431105726-3682-16-git-send-email-kwolf@redhat.com>
In-Reply-To: <1431105726-3682-16-git-send-email-kwolf@redhat.com>
Content-Type: text/plain; charset=iso-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 15/34] qcow2: Move qcow2_update_options()
	call up
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Kevin Wolf <kwolf@redhat.com>, qemu-block@nongnu.org
Cc: armbru@redhat.com, qemu-devel@nongnu.org

On 08.05.2015 19:21, Kevin Wolf wrote:
> 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 <kwolf@redhat.com>
> ---
>   block/qcow2.c | 18 +++++++++---------
>   1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/block/qcow2.c b/block/qcow2.c
> index db535d4..761ba30 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -911,6 +911,15 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
>           goto fail;
>       }
>   
> +    /* Enable lazy_refcounts according to image and command line options */

Again, I find the comment not very fitting. But the motion itself is 
okay, so regardless of what comment you are moving here:

Reviewed-by: Max Reitz <mreitz@redhat.com>

> +    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
> @@ -995,15 +1004,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};