From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MJWlj-0005eW-2N
	for qemu-devel@nongnu.org; Wed, 24 Jun 2009 14:00:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MJWla-0005Rf-84
	for qemu-devel@nongnu.org; Wed, 24 Jun 2009 14:00:18 -0400
Received: from [199.232.76.173] (port=35879 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MJWlZ-0005Qg-Sf
	for qemu-devel@nongnu.org; Wed, 24 Jun 2009 14:00:13 -0400
Received: from mail2.shareable.org ([80.68.89.115]:40252)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <jamie@shareable.org>) id 1MJWlX-00052X-Aq
	for qemu-devel@nongnu.org; Wed, 24 Jun 2009 14:00:11 -0400
Date: Wed, 24 Jun 2009 19:00:09 +0100
From: Jamie Lokier <jamie@shareable.org>
Subject: Re: [Qemu-devel] [PATCH v2] Fix QCOW2 debugging code to compile again
Message-ID: <20090624180009.GK14121@shareable.org>
References: <E1MJ9ci-0002Hj-03@lists.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1MJ9ci-0002Hj-03@lists.gnu.org>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Filip Navara <filip.navara@gmail.com>
Cc: qemu-devel@nongnu.org

Filip Navara wrote:
> Updated to use C99 comments.

I don't see any _change_ to the use of C99 comments in the patch below.
Some C99 comments are moved from one place to another, that's all.

And some function renaming.

-- Jamie

> Signed-off-by: Filip Navara <filip.navara@gmail.com>
> ---
>  block/qcow2-snapshot.c |    6 +++---
>  block/qcow2.c          |    6 +-----
>  block/qcow2.h          |    4 ++++
>  3 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
> index e1e4d89..94cb838 100644
> --- a/block/qcow2-snapshot.c
> +++ b/block/qcow2-snapshot.c
> @@ -288,7 +288,7 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
>      if (qcow_write_snapshots(bs) < 0)
>          goto fail;
>  #ifdef DEBUG_ALLOC
> -    check_refcounts(bs);
> +    qcow2_check_refcounts(bs);
>  #endif
>      return 0;
>   fail:
> @@ -332,7 +332,7 @@ int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id)
>          goto fail;
>  
>  #ifdef DEBUG_ALLOC
> -    check_refcounts(bs);
> +    qcow2_check_refcounts(bs);
>  #endif
>      return 0;
>   fail:
> @@ -369,7 +369,7 @@ int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id)
>          return ret;
>      }
>  #ifdef DEBUG_ALLOC
> -    check_refcounts(bs);
> +    qcow2_check_refcounts(bs);
>  #endif
>      return 0;
>  }
> diff --git a/block/qcow2.c b/block/qcow2.c
> index 9acbddf..20c114b 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -44,10 +44,6 @@
>    - L2 tables have always a size of one cluster.
>  */
>  
> -//#define DEBUG_ALLOC
> -//#define DEBUG_ALLOC2
> -//#define DEBUG_EXT
> -
>  
>  typedef struct {
>      uint32_t magic;
> @@ -251,7 +247,7 @@ static int qcow_open(BlockDriverState *bs, const char *filename, int flags)
>          goto fail;
>  
>  #ifdef DEBUG_ALLOC
> -    check_refcounts(bs);
> +    qcow2_check_refcounts(bs);
>  #endif
>      return 0;
>  
> diff --git a/block/qcow2.h b/block/qcow2.h
> index d734003..8624e0c 100644
> --- a/block/qcow2.h
> +++ b/block/qcow2.h
> @@ -27,6 +27,10 @@
>  
>  #include "aes.h"
>  
> +//#define DEBUG_ALLOC
> +//#define DEBUG_ALLOC2
> +//#define DEBUG_EXT
> +
>  #define QCOW_MAGIC (('Q' << 24) | ('F' << 16) | ('I' << 8) | 0xfb)
>  #define QCOW_VERSION 2
>