summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilip Navara <filip.navara@gmail.com>2009-06-23 19:17:30 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2009-06-29 08:52:40 -0500
commitc4dccceb27bdc485115be82bb818a10caf138b39 (patch)
treed683ae55441c38442f3dbf0c1c40403ebff10b43
parent332c243c7cf5a4a454d4fbd6bcc601d7eacc821d (diff)
downloadqemu-c4dccceb27bdc485115be82bb818a10caf138b39.tar.gz
qemu-c4dccceb27bdc485115be82bb818a10caf138b39.tar.bz2
qemu-c4dccceb27bdc485115be82bb818a10caf138b39.zip
Fix QCOW2 debugging code to compile again
Updated to use C99 comments. Signed-off-by: Filip Navara <filip.navara@gmail.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--block/qcow2-snapshot.c6
-rw-r--r--block/qcow2.c6
-rw-r--r--block/qcow2.h4
3 files changed, 8 insertions, 8 deletions
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index e1e4d89738..94cb838064 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 9acbddf943..20c114b139 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 d734003068..c99b374bd0 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