ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qcow2: introduce check_refcounts_l1/l2() flags 

The check_refcounts_l1/l2() functions have a check_copied argument to
check that the QCOW_O_COPIED flag is consistent with refcount == 1.
This should be a bool, not an int.

However, the next patch introduces qcow2 fragmentation statistics and
also needs to pass an option to check_refcounts_l1/l2().  This is a good
opportunity to use an int flags field.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2013-02-07 17:15:01 +01:00 committed by Kevin Wolf
parent 8599ea4c42
commit 801f704452
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
block/qcow2-refcount.c
View File

@ -914,6 +914,11 @@ static void inc_refcounts(BlockDriverState *bs,
} }
} }
/* Flags for check_refcounts_l1() and check_refcounts_l2() */
enum {
CHECK_OFLAG_COPIED = 0x1, /* check QCOW_OFLAG_COPIED matches refcount */
};
/* /*
* Increases the refcount in the given refcount table for the all clusters * Increases the refcount in the given refcount table for the all clusters
* referenced in the L2 table. While doing so, performs some checks on L2 * referenced in the L2 table. While doing so, performs some checks on L2
@ -924,7 +929,7 @@ static void inc_refcounts(BlockDriverState *bs,
*/ */
static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res, static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
uint16_t *refcount_table, int refcount_table_size, int64_t l2_offset, uint16_t *refcount_table, int refcount_table_size, int64_t l2_offset,
int check_copied) int flags)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
uint64_t *l2_table, l2_entry; uint64_t *l2_table, l2_entry;
@ -971,7 +976,7 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
/* QCOW_OFLAG_COPIED must be set iff refcount == 1 */ /* QCOW_OFLAG_COPIED must be set iff refcount == 1 */
uint64_t offset = l2_entry & L2E_OFFSET_MASK; uint64_t offset = l2_entry & L2E_OFFSET_MASK;
if (check_copied) { if (flags & CHECK_OFLAG_COPIED) {
refcount = get_refcount(bs, offset >> s->cluster_bits); refcount = get_refcount(bs, offset >> s->cluster_bits);
if (refcount < 0) { if (refcount < 0) {
fprintf(stderr, "Can't get refcount for offset %" fprintf(stderr, "Can't get refcount for offset %"
@ -1028,7 +1033,7 @@ static int check_refcounts_l1(BlockDriverState *bs,
uint16_t *refcount_table, uint16_t *refcount_table,
int refcount_table_size, int refcount_table_size,
int64_t l1_table_offset, int l1_size, int64_t l1_table_offset, int l1_size,
int check_copied) int flags)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
uint64_t *l1_table, l2_offset, l1_size2; uint64_t *l1_table, l2_offset, l1_size2;
@ -1057,7 +1062,7 @@ static int check_refcounts_l1(BlockDriverState *bs,
l2_offset = l1_table[i]; l2_offset = l1_table[i];
if (l2_offset) { if (l2_offset) {
/* QCOW_OFLAG_COPIED must be set iff refcount == 1 */ /* QCOW_OFLAG_COPIED must be set iff refcount == 1 */
if (check_copied) { if (flags & CHECK_OFLAG_COPIED) {
refcount = get_refcount(bs, (l2_offset & ~QCOW_OFLAG_COPIED) refcount = get_refcount(bs, (l2_offset & ~QCOW_OFLAG_COPIED)
>> s->cluster_bits); >> s->cluster_bits);
if (refcount < 0) { if (refcount < 0) {
@ -1086,7 +1091,7 @@ static int check_refcounts_l1(BlockDriverState *bs,
/* Process and check L2 entries */ /* Process and check L2 entries */
ret = check_refcounts_l2(bs, res, refcount_table, ret = check_refcounts_l2(bs, res, refcount_table,
refcount_table_size, l2_offset, check_copied); refcount_table_size, l2_offset, flags);
if (ret < 0) { if (ret < 0) {
goto fail; goto fail;
} }
@ -1128,7 +1133,8 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
/* current L1 table */ /* current L1 table */
ret = check_refcounts_l1(bs, res, refcount_table, nb_clusters, ret = check_refcounts_l1(bs, res, refcount_table, nb_clusters,
s->l1_table_offset, s->l1_size, 1); s->l1_table_offset, s->l1_size,
CHECK_OFLAG_COPIED);
if (ret < 0) { if (ret < 0) {
goto fail; goto fail;
} }