Fix QCOW2 debugging code to compile again
PATCH v2 1/1 Fix QCOW2 debugging code to compile again
Updated to use C99 comments.
Signed-off-by Filip Navara <[email protected]>
--- block/qcow2-snapshot.c | 6 +++--- block/qcow2.c | 6 +----- block/qcow2.h | 4 ++++ 3 files changed, 8 insertions(+), 8 deletions(-)
block/qcow2-snapshot.c +3 -3
@@ -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 ; }
block/qcow2.c +1 -5
@@ -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 ;
block/qcow2.h +4 -0
@@ -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
Signature · 1 line
1.6.3.msysgit.0
Quoted 1 line · Filip Navara
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
Quoted 77 lines
Signed-off-by Filip Navara <[email protected]>--- block/qcow2-snapshot.c | 6 +++--- block/qcow2.c | 6 +----- block/qcow2.h | 4 ++++ 3 files changed, 8 insertions(+), 8 deletions(-)block/qcow2-snapshot.c +3
-3@@ -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 ; }block/qcow2.c +1
-5@@ -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 ;block/qcow2.h +4
-0@@ -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
Quoted 5 lines · Jamie Lokier
Quoted 1 line · Filip Navara
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