[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/32] qcow2: Calculate refcount block entry count
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 07/32] qcow2: Calculate refcount block entry count |
Date: |
Thu, 23 Oct 2014 22:42:14 +0200 |
From: Max Reitz <address@hidden>
The size of a refblock entry is (in theory) variable; calculate
therefore the number of entries per refblock and the according bit shift
(1 << x == entry count) when opening an image.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2.c | 3 +++
block/qcow2.h | 2 ++
2 files changed, 5 insertions(+)
diff --git a/block/qcow2.c b/block/qcow2.c
index 156a219..3c8b881 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -698,6 +698,9 @@ static int qcow2_open(BlockDriverState *bs, QDict *options,
int flags,
s->l2_bits = s->cluster_bits - 3; /* L2 is always one cluster */
s->l2_size = 1 << s->l2_bits;
+ /* 2^(s->refcount_order - 3) is the refcount width in bytes */
+ s->refcount_block_bits = s->cluster_bits - (s->refcount_order - 3);
+ s->refcount_block_size = 1 << s->refcount_block_bits;
bs->total_sectors = header.size / 512;
s->csize_shift = (62 - (s->cluster_bits - 8));
s->csize_mask = (1 << (s->cluster_bits - 8)) - 1;
diff --git a/block/qcow2.h b/block/qcow2.h
index 7d61e61..47cd4b3 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -223,6 +223,8 @@ typedef struct BDRVQcowState {
int l2_size;
int l1_size;
int l1_vm_state_index;
+ int refcount_block_bits;
+ int refcount_block_size;
int csize_shift;
int csize_mask;
uint64_t cluster_offset_mask;
--
1.8.3.1
- [Qemu-devel] [PULL 00/32] Block patches, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 03/32] MAINTAINERS: add the image fuzzer to the block layer, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 01/32] MAINTAINERS: add aio to block layer, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 05/32] block: qemu-iotests change _supported_proto to file once more., Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 02/32] MAINTAINERS: qemu-iotests belongs to the block layer, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 06/32] block: Add qemu_{,try_}blockalign0(), Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 04/32] block/vdi: Use {DIV_,}ROUND_UP, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 08/32] qcow2: Fix leaks in dirty images, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 07/32] qcow2: Calculate refcount block entry count,
Kevin Wolf <=
- [Qemu-devel] [PULL 09/32] qcow2: Split qcow2_check_refcounts(), Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 10/32] qcow2: Use sizeof(**refcount_table), Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 11/32] qcow2: Pull check_refblocks() up, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 13/32] qcow2: Split fail code in L1 and L2 checks, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 12/32] qcow2: Use int64_t for in-memory reftable size, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 14/32] qcow2: Let inc_refcounts() return -errno, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 16/32] qcow2: Reuse refcount table in calculate_refcounts(), Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 15/32] qcow2: Let inc_refcounts() resize the reftable, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 17/32] qcow2: Fix refcount blocks beyond image end, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 18/32] qcow2: Do not perform potentially damaging repairs, Kevin Wolf, 2014/10/23