mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qcow2: Support external data file in qemu-img check 

For external data files, data clusters must be excluded from the
refcount calculations. Instead, an implicit refcount of 1 is assumed for
the COPIED flag.

Compressed clusters and internal snapshots are incompatible with
external data files, so print an error if they are in use for images
with an external data file.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2019-02-27 17:26:40 +01:00
parent aa8b34c1b2
commit e9f5b6deaa
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
block/qcow2-refcount.c
View File

@ -1605,6 +1605,13 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
res->corruptions++; res->corruptions++;
} }
if (has_data_file(bs)) {
fprintf(stderr, "ERROR compressed cluster %d with data file, "
"entry=0x%" PRIx64 "\n", i, l2_entry);
res->corruptions++;
break;
}
/* Mark cluster as used */ /* Mark cluster as used */
nb_csectors = ((l2_entry >> s->csize_shift) & nb_csectors = ((l2_entry >> s->csize_shift) &
s->csize_mask) + 1; s->csize_mask) + 1;
@ -1695,11 +1702,13 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
} }
/* Mark cluster as used */ /* Mark cluster as used */
ret = qcow2_inc_refcounts_imrt(bs, res, if (!has_data_file(bs)) {
refcount_table, refcount_table_size, ret = qcow2_inc_refcounts_imrt(bs, res, refcount_table,
offset, s->cluster_size); refcount_table_size,
if (ret < 0) { offset, s->cluster_size);
goto fail; if (ret < 0) {
goto fail;
}
} }
break; break;
} }
@ -1884,12 +1893,16 @@ static int check_oflag_copied(BlockDriverState *bs, BdrvCheckResult *res,
if (cluster_type == QCOW2_CLUSTER_NORMAL || if (cluster_type == QCOW2_CLUSTER_NORMAL ||
cluster_type == QCOW2_CLUSTER_ZERO_ALLOC) { cluster_type == QCOW2_CLUSTER_ZERO_ALLOC) {
ret = qcow2_get_refcount(bs, if (has_data_file(bs)) {
data_offset >> s->cluster_bits, refcount = 1;
&refcount); } else {
if (ret < 0) { ret = qcow2_get_refcount(bs,
/* don't print message nor increment check_errors */ data_offset >> s->cluster_bits,
continue; &refcount);
if (ret < 0) {
/* don't print message nor increment check_errors */
continue;
}
} }
if ((refcount == 1) != ((l2_entry & QCOW_OFLAG_COPIED) != 0)) { if ((refcount == 1) != ((l2_entry & QCOW_OFLAG_COPIED) != 0)) {
fprintf(stderr, "%s OFLAG_COPIED data cluster: " fprintf(stderr, "%s OFLAG_COPIED data cluster: "
@ -2083,6 +2096,12 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
} }
/* snapshots */ /* snapshots */
if (has_data_file(bs) && s->nb_snapshots) {
fprintf(stderr, "ERROR %d snapshots in image with data file\n",
s->nb_snapshots);
res->corruptions++;
}
for (i = 0; i < s->nb_snapshots; i++) { for (i = 0; i < s->nb_snapshots; i++) {
sn = s->snapshots + i; sn = s->snapshots + i;
if (offset_into_cluster(s, sn->l1_table_offset)) { if (offset_into_cluster(s, sn->l1_table_offset)) {