Fix QCOW2 debugging code to compile again
PATCH 1/1 Fix QCOW2 debugging code to compile again
--- 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 9 lines · Filip Navara
Signed-off-by Filip Navara <[email protected]>-//#define
DEBUG_ALLOC
-//#defineDEBUG_ALLOC2
-//#defineDEBUG_EXT+/* #define
DEBUG_ALLOC*/
+/* #defineDEBUG_ALLOC2*/
+/* #defineDEBUG_EXT*/
The C99 comment version is much more convenient than K&R comment version in cases like this, where the intention is to be able to enable the define quickly.
Quoted 7 lines · Blue Swirl
Quoted 5 lines · Filip Navara
Signed-off-by Filip Navara <[email protected]>-//#define
DEBUG_ALLOC
-//#defineDEBUG_ALLOC2
-//#defineDEBUG_EXT
Quoted 7 lines
Quoted 3 lines
+/* #define
DEBUG_ALLOC*/
+/* #defineDEBUG_ALLOC2*/
+/* #defineDEBUG_EXT*/The C99 comment version is much more convenient than K&R comment version in cases like this, where the intention is to be able to enable the define quickly.
It's all the same for me: C-u A-;
(defun caml-comment-till-end-of-line (&optional arg)
(interactive "P")
(save-excursion
(if (looking-at search-whitespace-regexp)
(re-search-forward search-whitespace-regexp))
(comment-region (point) (progn (end-of-line) (point)) arg)))
(global-set-key [(alt ?\;)] 'caml-comment-till-end-of-line)
Signature · 1 line
mailto:[email protected]
Quoted 10 lines · malc
Quoted 8 lines · Blue Swirl
Quoted 7 lines · Filip Navara
Signed-off-by Filip Navara <[email protected]>-//#define
DEBUG_ALLOC
-//#defineDEBUG_ALLOC2
-//#defineDEBUG_EXT
+/* #defineDEBUG_ALLOC*/
+/* #defineDEBUG_ALLOC2*/
+/* #defineDEBUG_EXT*/
Quoted 3 lines
Quoted 3 lines
The C99 comment version is much more convenient than K&R comment version in cases like this, where the intention is to be able to enable the define quickly.
I agree.
Quoted 1 line
It's all the same for me: C-u A-;
You're not alone in the world.
Kevin