diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2012-03-16 14:09:08 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-04-20 15:57:29 +0200 |
| commit | 76dc9e0c8f369f1695e5413de2e28d69108476bb (patch) | |
| tree | 7a61be9396100133151e807a643eddbd73d8242a /block | |
| parent | 143550a83ef4eef86a847d00023d148e1f59f743 (diff) | |
| download | qemu-76dc9e0c8f369f1695e5413de2e28d69108476bb.zip | |
qcow2: Ignore reserved bits in refcount table entries
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2-refcount.c | 2 | ||||
| -rw-r--r-- | block/qcow2.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 909d61560a..e0854dc85d 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -167,7 +167,7 @@ static int alloc_refcount_block(BlockDriverState *bs, if (refcount_table_index < s->refcount_table_size) { uint64_t refcount_block_offset = - s->refcount_table[refcount_table_index]; + s->refcount_table[refcount_table_index] & REFT_OFFSET_MASK; /* If it's already there, we're done */ if (refcount_block_offset) { diff --git a/block/qcow2.h b/block/qcow2.h index a22d7fafbe..291309a9e7 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -175,6 +175,8 @@ enum { #define L2E_OFFSET_MASK 0x00ffffffffffff00ULL #define L2E_COMPRESSED_OFFSET_SIZE_MASK 0x3fffffffffffffffULL +#define REFT_OFFSET_MASK 0xffffffffffffff00ULL + static inline int size_to_clusters(BDRVQcowState *s, int64_t size) { return (size + (s->cluster_size - 1)) >> s->cluster_bits; |