From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsUjt-0003RN-CP for qemu-devel@nongnu.org; Wed, 13 May 2015 07:22:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsUjs-0003Yv-B8 for qemu-devel@nongnu.org; Wed, 13 May 2015 07:22:13 -0400 Message-ID: <555333D6.2020608@redhat.com> Date: Wed, 13 May 2015 13:21:58 +0200 From: Max Reitz MIME-Version: 1.0 References: <1431105726-3682-1-git-send-email-kwolf@redhat.com> <1431105726-3682-15-git-send-email-kwolf@redhat.com> In-Reply-To: <1431105726-3682-15-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 14/34] qcow2: Factor out qcow2_update_options() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf , qemu-block@nongnu.org Cc: armbru@redhat.com, qemu-devel@nongnu.org On 08.05.2015 19:21, Kevin Wolf wrote: > Eventually we want to be able to change options at runtime. As a first > step towards that goal, separate some option handling code from the > general initialisation code in qcow2_open(). > > Signed-off-by: Kevin Wolf > --- > block/qcow2.c | 135 +++++++++++++++++++++++++++++++++------------------------- > 1 file changed, 76 insertions(+), 59 deletions(-) > > diff --git a/block/qcow2.c b/block/qcow2.c > index b9a72e3..db535d4 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c [snip] > @@ -549,8 +623,6 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, > Error *local_err = NULL; > uint64_t ext_end; > uint64_t l1_vm_state_index; > - const char *opt_overlap_check, *opt_overlap_check_template; > - int overlap_check_template = 0; > uint64_t l2_cache_size, refcount_cache_size; > > ret = bdrv_pread(bs->file, 0, &header, sizeof(header)); > @@ -924,69 +996,14 @@ 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) { The comment looks a bit strange now, because qcow2_update_options() doesn't update just lazy_refcounts. Max