mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qcow2: Fix DEBUG_* compilation

Browse Source 
By introducing BlockDriverState compiling qcow2 with DEBUG_ALLOC and DEBUG_EXT
defined got broken.
Define a BdrvCheckResult structure locally which is now needed as the second
argument.

Also fix qcow2_read_extensions() needing BDRVQcowState.

Signed-off-by: Philipp Hahn <hahn@univention.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Philipp Hahn 2011-08-04 19:22:10 +02:00 committed by Kevin Wolf
parent 92196b2f56
commit 6cbc3031c8
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
block/qcow2-snapshot.c
View File

@ -303,7 +303,10 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
if (qcow2_write_snapshots(bs) < 0) if (qcow2_write_snapshots(bs) < 0)
goto fail; goto fail;
#ifdef DEBUG_ALLOC #ifdef DEBUG_ALLOC
qcow2_check_refcounts(bs); {
BdrvCheckResult result = {0};
qcow2_check_refcounts(bs, &result);
}
#endif #endif
return 0; return 0;
fail: fail:
@ -353,7 +356,10 @@ int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id)
goto fail; goto fail;
#ifdef DEBUG_ALLOC #ifdef DEBUG_ALLOC
qcow2_check_refcounts(bs); {
BdrvCheckResult result = {0};
qcow2_check_refcounts(bs, &result);
}
#endif #endif
return 0; return 0;
fail: fail:
@ -390,7 +396,10 @@ int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id)
return ret; return ret;
} }
#ifdef DEBUG_ALLOC #ifdef DEBUG_ALLOC
qcow2_check_refcounts(bs); {
BdrvCheckResult result = {0};
qcow2_check_refcounts(bs, &result);
}
#endif #endif
return 0; return 0;
} }

6
block/qcow2.c
View File

@ -87,6 +87,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
while (offset < end_offset) { while (offset < end_offset) {
#ifdef DEBUG_EXT #ifdef DEBUG_EXT
BDRVQcowState *s = bs->opaque;
/* Sanity check */ /* Sanity check */
if (offset > s->cluster_size) if (offset > s->cluster_size)
printf("qcow2_read_extension: suspicious offset %lu\n", offset); printf("qcow2_read_extension: suspicious offset %lu\n", offset);
@ -280,7 +281,10 @@ static int qcow2_open(BlockDriverState *bs, int flags)
qemu_co_mutex_init(&s->lock); qemu_co_mutex_init(&s->lock);
#ifdef DEBUG_ALLOC #ifdef DEBUG_ALLOC
qcow2_check_refcounts(bs); {
BdrvCheckResult result = {0};
qcow2_check_refcounts(bs, &result);
}
#endif #endif
return ret; return ret;