From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MJ7sW-0001TV-Sn for qemu-devel@nongnu.org; Tue, 23 Jun 2009 11:25:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MJ7sV-0001T2-Sd for qemu-devel@nongnu.org; Tue, 23 Jun 2009 11:25:44 -0400 Received: from [199.232.76.173] (port=59111 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MJ7sV-0001Su-NW for qemu-devel@nongnu.org; Tue, 23 Jun 2009 11:25:43 -0400 Received: from a40-prg1-8-129.static.adsl.vol.cz ([88.146.54.129]:27561 helo=FilipNavara-PC) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1MJ7sU-0002ov-EM for qemu-devel@nongnu.org; Tue, 23 Jun 2009 11:25:43 -0400 From: Filip Navara Sender: Filip Navara MIME-Version: 1.0 Content-Type: text/plain; boundary=WC_MAIL_PaRt_BoUnDaRy_05151998 Message-Id: Subject: [Qemu-devel] [PATCH] Fix QCOW2 debugging code to compile again List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 23 Jun 2009 15:25:45 -0000 To: qemu-devel@nongnu.org Signed-off-by: Filip Navara --- 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