mirror of
https://github.com/qemu/qemu.git
synced 2024-11-24 19:33:39 +08:00
qcow2: Use 64 bits for refcount values
Refcounts may have a width of up to 64 bits, so qemu should use the same width to represent refcount values internally. Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz
Kevin Wolf
parent
2aabe7c7a1
commit
0e06528e98
@ -1640,7 +1640,7 @@ static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table,
|
||||
for (i = 0; i < l1_size; i++) {
|
||||
uint64_t l2_offset = l1_table[i] & L1E_OFFSET_MASK;
|
||||
bool l2_dirty = false;
|
||||
uint16_t l2_refcount;
|
||||
uint64_t l2_refcount;
|
||||
|
||||
if (!l2_offset) {
|
||||
/* unallocated */
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
static int64_t alloc_clusters_noref(BlockDriverState *bs, uint64_t size);
|
||||
static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
|
||||
int64_t offset, int64_t length, uint16_t addend,
|
||||
int64_t offset, int64_t length, uint64_t addend,
|
||||
bool decrease, enum qcow2_discard_type type);
|
||||
|
||||
|
||||
@ -91,7 +91,7 @@ static int load_refcount_block(BlockDriverState *bs,
|
||||
* *refcount. Returns 0 on success and -errno on failure.
|
||||
*/
|
||||
int qcow2_get_refcount(BlockDriverState *bs, int64_t cluster_index,
|
||||
uint16_t *refcount)
|
||||
uint64_t *refcount)
|
||||
{
|
||||
BDRVQcowState *s = bs->opaque;
|
||||
uint64_t refcount_table_index, block_index;
|
||||
@ -535,7 +535,7 @@ found:
|
||||
static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
|
||||
int64_t offset,
|
||||
int64_t length,
|
||||
uint16_t addend,
|
||||
uint64_t addend,
|
||||
bool decrease,
|
||||
enum qcow2_discard_type type)
|
||||
{
|
||||
@ -547,7 +547,7 @@ static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
|
||||
|
||||
#ifdef DEBUG_ALLOC2
|
||||
fprintf(stderr, "update_refcount: offset=%" PRId64 " size=%" PRId64
|
||||
" addend=%s%" PRIu16 "\n", offset, length, decrease ? "-" : "",
|
||||
" addend=%s%" PRIu64 "\n", offset, length, decrease ? "-" : "",
|
||||
addend);
|
||||
#endif
|
||||
if (length < 0) {
|
||||
@ -567,7 +567,7 @@ static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
|
||||
cluster_offset += s->cluster_size)
|
||||
{
|
||||
int block_index;
|
||||
uint16_t refcount;
|
||||
uint64_t refcount;
|
||||
int64_t cluster_index = cluster_offset >> s->cluster_bits;
|
||||
int64_t table_index = cluster_index >> s->refcount_block_bits;
|
||||
|
||||
@ -594,9 +594,9 @@ static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
|
||||
block_index = cluster_index & (s->refcount_block_size - 1);
|
||||
|
||||
refcount = be16_to_cpu(refcount_block[block_index]);
|
||||
if (decrease ? ((uint16_t)(refcount - addend) > refcount)
|
||||
: ((uint16_t)(refcount + addend) < refcount ||
|
||||
(uint16_t)(refcount + addend) > s->refcount_max))
|
||||
if (decrease ? (refcount - addend > refcount)
|
||||
: (refcount + addend < refcount ||
|
||||
refcount + addend > s->refcount_max))
|
||||
{
|
||||
ret = -EINVAL;
|
||||
goto fail;
|
||||
@ -656,7 +656,7 @@ fail:
|
||||
*/
|
||||
int qcow2_update_cluster_refcount(BlockDriverState *bs,
|
||||
int64_t cluster_index,
|
||||
uint16_t addend, bool decrease,
|
||||
uint64_t addend, bool decrease,
|
||||
enum qcow2_discard_type type)
|
||||
{
|
||||
BDRVQcowState *s = bs->opaque;
|
||||
@ -682,8 +682,7 @@ int qcow2_update_cluster_refcount(BlockDriverState *bs,
|
||||
static int64_t alloc_clusters_noref(BlockDriverState *bs, uint64_t size)
|
||||
{
|
||||
BDRVQcowState *s = bs->opaque;
|
||||
uint64_t i, nb_clusters;
|
||||
uint16_t refcount;
|
||||
uint64_t i, nb_clusters, refcount;
|
||||
int ret;
|
||||
|
||||
nb_clusters = size_to_clusters(s, size);
|
||||
@ -741,9 +740,8 @@ int qcow2_alloc_clusters_at(BlockDriverState *bs, uint64_t offset,
|
||||
int nb_clusters)
|
||||
{
|
||||
BDRVQcowState *s = bs->opaque;
|
||||
uint64_t cluster_index;
|
||||
uint64_t cluster_index, refcount;
|
||||
uint64_t i;
|
||||
uint16_t refcount;
|
||||
int ret;
|
||||
|
||||
assert(nb_clusters >= 0);
|
||||
@ -791,7 +789,7 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size)
|
||||
offset = s->free_byte_offset;
|
||||
|
||||
if (offset) {
|
||||
uint16_t refcount;
|
||||
uint64_t refcount;
|
||||
ret = qcow2_get_refcount(bs, offset >> s->cluster_bits, &refcount);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
@ -898,11 +896,10 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs,
|
||||
int64_t l1_table_offset, int l1_size, int addend)
|
||||
{
|
||||
BDRVQcowState *s = bs->opaque;
|
||||
uint64_t *l1_table, *l2_table, l2_offset, offset, l1_size2;
|
||||
uint64_t *l1_table, *l2_table, l2_offset, offset, l1_size2, refcount;
|
||||
bool l1_allocated = false;
|
||||
int64_t old_offset, old_l2_offset;
|
||||
int i, j, l1_modified = 0, nb_csectors;
|
||||
uint16_t refcount;
|
||||
int ret;
|
||||
|
||||
assert(addend >= -1 && addend <= 1);
|
||||
@ -1371,7 +1368,7 @@ static int check_oflag_copied(BlockDriverState *bs, BdrvCheckResult *res,
|
||||
BDRVQcowState *s = bs->opaque;
|
||||
uint64_t *l2_table = qemu_blockalign(bs, s->cluster_size);
|
||||
int ret;
|
||||
uint16_t refcount;
|
||||
uint64_t refcount;
|
||||
int i, j;
|
||||
|
||||
for (i = 0; i < s->l1_size; i++) {
|
||||
@ -1391,7 +1388,7 @@ static int check_oflag_copied(BlockDriverState *bs, BdrvCheckResult *res,
|
||||
}
|
||||
if ((refcount == 1) != ((l1_entry & QCOW_OFLAG_COPIED) != 0)) {
|
||||
fprintf(stderr, "%s OFLAG_COPIED L2 cluster: l1_index=%d "
|
||||
"l1_entry=%" PRIx64 " refcount=%d\n",
|
||||
"l1_entry=%" PRIx64 " refcount=%" PRIu64 "\n",
|
||||
fix & BDRV_FIX_ERRORS ? "Repairing" :
|
||||
"ERROR",
|
||||
i, l1_entry, refcount);
|
||||
@ -1435,7 +1432,7 @@ static int check_oflag_copied(BlockDriverState *bs, BdrvCheckResult *res,
|
||||
}
|
||||
if ((refcount == 1) != ((l2_entry & QCOW_OFLAG_COPIED) != 0)) {
|
||||
fprintf(stderr, "%s OFLAG_COPIED data cluster: "
|
||||
"l2_entry=%" PRIx64 " refcount=%d\n",
|
||||
"l2_entry=%" PRIx64 " refcount=%" PRIu64 "\n",
|
||||
fix & BDRV_FIX_ERRORS ? "Repairing" :
|
||||
"ERROR",
|
||||
l2_entry, refcount);
|
||||
@ -1661,7 +1658,7 @@ static void compare_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
|
||||
{
|
||||
BDRVQcowState *s = bs->opaque;
|
||||
int64_t i;
|
||||
uint16_t refcount1, refcount2;
|
||||
uint64_t refcount1, refcount2;
|
||||
int ret;
|
||||
|
||||
for (i = 0, *highest_cluster = 0; i < nb_clusters; i++) {
|
||||
@ -1690,7 +1687,8 @@ static void compare_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
|
||||
num_fixed = &res->corruptions_fixed;
|
||||
}
|
||||
|
||||
fprintf(stderr, "%s cluster %" PRId64 " refcount=%d reference=%d\n",
|
||||
fprintf(stderr, "%s cluster %" PRId64 " refcount=%" PRIu64
|
||||
" reference=%" PRIu64 "\n",
|
||||
num_fixed != NULL ? "Repairing" :
|
||||
refcount1 < refcount2 ? "ERROR" :
|
||||
"Leaked",
|
||||
|
||||
@ -459,7 +459,7 @@ static inline uint64_t l2meta_cow_end(QCowL2Meta *m)
|
||||
+ (m->cow_end.nb_sectors << BDRV_SECTOR_BITS);
|
||||
}
|
||||
|
||||
static inline uint16_t refcount_diff(uint16_t r1, uint16_t r2)
|
||||
static inline uint64_t refcount_diff(uint64_t r1, uint64_t r2)
|
||||
{
|
||||
return r1 > r2 ? r1 - r2 : r2 - r1;
|
||||
}
|
||||
@ -484,10 +484,10 @@ int qcow2_refcount_init(BlockDriverState *bs);
|
||||
void qcow2_refcount_close(BlockDriverState *bs);
|
||||
|
||||
int qcow2_get_refcount(BlockDriverState *bs, int64_t cluster_index,
|
||||
uint16_t *refcount);
|
||||
uint64_t *refcount);
|
||||
|
||||
int qcow2_update_cluster_refcount(BlockDriverState *bs, int64_t cluster_index,
|
||||
uint16_t addend, bool decrease,
|
||||
uint64_t addend, bool decrease,
|
||||
enum qcow2_discard_type type);
|
||||
|
||||
int64_t qcow2_alloc_clusters(BlockDriverState *bs, uint64_t size);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user