[Qemu-devel] [PATCH v2] Fix QCOW2 debugging code to compile again

[Qemu-devel] [PATCH v2] Fix QCOW2 debugging code to compile again

[Filip Navara]

Updated to use C99 comments.

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
 
-- 
1.6.3.msysgit.0

Re: [Qemu-devel] [PATCH v2] Fix QCOW2 debugging code to compile again

[Jamie Lokier]

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
>  

Re: [Qemu-devel] [PATCH v2] Fix QCOW2 debugging code to compile again

[Filip Navara]

On Wed, Jun 24, 2009 at 8:00 PM, Jamie Lokier<jamie@shareable.org> wrote:
> 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.

It's a change from the first version of the patch that used C89
comments and which people complained about.

Best regards,
Filip Navara