From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsV8l-0000wh-Jx for qemu-devel@nongnu.org; Wed, 13 May 2015 07:47:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsV8i-0002ZZ-US for qemu-devel@nongnu.org; Wed, 13 May 2015 07:47:55 -0400 Message-ID: <555339E1.3050607@redhat.com> Date: Wed, 13 May 2015 13:47:45 +0200 From: Max Reitz MIME-Version: 1.0 References: <1431105726-3682-1-git-send-email-kwolf@redhat.com> <1431105726-3682-18-git-send-email-kwolf@redhat.com> In-Reply-To: <1431105726-3682-18-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 17/34] qcow2: Leave s unchanged on qcow2_update_options() failure 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: > On return, either all new options should be applied to BDRVQcowState (on > success), or all of the old setting should be preserved (on failure). > > Signed-off-by: Kevin Wolf > --- > block/qcow2.c | 52 ++++++++++++++++++++++++++++++++-------------------- > 1 file changed, 32 insertions(+), 20 deletions(-) > > diff --git a/block/qcow2.c b/block/qcow2.c > index a4a267d..abe22f3 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c > @@ -546,6 +546,9 @@ static int qcow2_update_options(BlockDriverState *bs, QDict *options, > const char *opt_overlap_check, *opt_overlap_check_template; > int overlap_check_template = 0; > uint64_t l2_cache_size, refcount_cache_size; > + Qcow2Cache* l2_table_cache; > + Qcow2Cache* refcount_block_cache; ;-) Because patch 18 exists: Reviewed-by: Max Reitz