Commit 14899cdf authored by Filip Navara's avatar Filip Navara Committed by Anthony Liguori
Browse files

Fix QCOW2 debugging code to compile again 



Updated to use C99 comments.

Signed-off-by: default avatarFilip Navara <filip.navara@gmail.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent bf011293

block/qcow2-snapshot.c

+3 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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