|
 |
9ae3a8 |
From 48ec01bf0d7ad38571741cf9aca816a0bfdddbe0 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Date: Sat, 13 Jun 2015 16:22:10 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 16/42] qcow2: Calculate refcount block entry count
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1434212556-3927-17-git-send-email-mreitz@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 66035
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.2 qemu-kvm PATCH 16/42] qcow2: Calculate refcount block entry count
|
|
|
9ae3a8 |
Bugzilla: 1129893
|
|
|
9ae3a8 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
BZ: 1129893
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The size of a refblock entry is (in theory) variable; calculate
|
|
|
9ae3a8 |
therefore the number of entries per refblock and the according bit shift
|
|
|
9ae3a8 |
(1 << x == entry count) when opening an image.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 1d13d654666a7fd6d6a85a0ce9285dbf0d0444c2)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/qcow2.c | 3 +++
|
|
|
9ae3a8 |
block/qcow2.h | 2 ++
|
|
|
9ae3a8 |
2 files changed, 5 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/qcow2.c b/block/qcow2.c
|
|
|
9ae3a8 |
index be7e8e8..fae8b26 100644
|
|
|
9ae3a8 |
--- a/block/qcow2.c
|
|
|
9ae3a8 |
+++ b/block/qcow2.c
|
|
|
9ae3a8 |
@@ -604,6 +604,9 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
s->l2_bits = s->cluster_bits - 3; /* L2 is always one cluster */
|
|
|
9ae3a8 |
s->l2_size = 1 << s->l2_bits;
|
|
|
9ae3a8 |
+ /* 2^(s->refcount_order - 3) is the refcount width in bytes */
|
|
|
9ae3a8 |
+ s->refcount_block_bits = s->cluster_bits - (s->refcount_order - 3);
|
|
|
9ae3a8 |
+ s->refcount_block_size = 1 << s->refcount_block_bits;
|
|
|
9ae3a8 |
bs->total_sectors = header.size / 512;
|
|
|
9ae3a8 |
s->csize_shift = (62 - (s->cluster_bits - 8));
|
|
|
9ae3a8 |
s->csize_mask = (1 << (s->cluster_bits - 8)) - 1;
|
|
|
9ae3a8 |
diff --git a/block/qcow2.h b/block/qcow2.h
|
|
|
9ae3a8 |
index 2138462..b65f629 100644
|
|
|
9ae3a8 |
--- a/block/qcow2.h
|
|
|
9ae3a8 |
+++ b/block/qcow2.h
|
|
|
9ae3a8 |
@@ -213,6 +213,8 @@ typedef struct BDRVQcowState {
|
|
|
9ae3a8 |
int l2_size;
|
|
|
9ae3a8 |
int l1_size;
|
|
|
9ae3a8 |
int l1_vm_state_index;
|
|
|
9ae3a8 |
+ int refcount_block_bits;
|
|
|
9ae3a8 |
+ int refcount_block_size;
|
|
|
9ae3a8 |
int csize_shift;
|
|
|
9ae3a8 |
int csize_mask;
|
|
|
9ae3a8 |
uint64_t cluster_offset_mask;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|