[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/31] qcow2: Add l2_slice_size field to BDRVQcow2St
From: |
Alberto Garcia |
Subject: |
[Qemu-devel] [PATCH 13/31] qcow2: Add l2_slice_size field to BDRVQcow2State |
Date: |
Thu, 12 Oct 2017 16:05:27 +0300 |
The BDRVQcow2State structure contains an l2_size field, which stores
the number of 64-bit entries in an L2 table.
For efficiency reasons we want to be able to load slices instead of
full L2 tables, so we need to know how many entries an L2 slice can
hold.
An L2 slice is the portion of an L2 table that is loaded by the qcow2
cache. At the moment that cache can only load complete tables,
therefore an L2 slice has the same size as an L2 table (one cluster)
and l2_size == l2_slice_size.
Later we'll allow smaller slices, but until then we have to use this
new l2_slice_size field to make the rest of the code ready for that.
Signed-off-by: Alberto Garcia <address@hidden>
---
block/qcow2.c | 3 +++
block/qcow2.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/block/qcow2.c b/block/qcow2.c
index 9f55e0a9ff..e5458fcffd 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -794,6 +794,7 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts
*opts,
typedef struct Qcow2ReopenState {
Qcow2Cache *l2_table_cache;
Qcow2Cache *refcount_block_cache;
+ int l2_slice_size;
bool use_lazy_refcounts;
int overlap_check;
bool discard_passthrough[QCOW2_DISCARD_MAX];
@@ -875,6 +876,7 @@ static int qcow2_update_options_prepare(BlockDriverState
*bs,
}
}
+ r->l2_slice_size = s->cluster_size / sizeof(uint64_t);
r->l2_table_cache = qcow2_cache_create(bs, l2_cache_size);
r->refcount_block_cache = qcow2_cache_create(bs, refcount_cache_size);
if (r->l2_table_cache == NULL || r->refcount_block_cache == NULL) {
@@ -1038,6 +1040,7 @@ static void qcow2_update_options_commit(BlockDriverState
*bs,
}
s->l2_table_cache = r->l2_table_cache;
s->refcount_block_cache = r->refcount_block_cache;
+ s->l2_slice_size = r->l2_slice_size;
s->overlap_check = r->overlap_check;
s->use_lazy_refcounts = r->use_lazy_refcounts;
diff --git a/block/qcow2.h b/block/qcow2.h
index 61c6c27673..9c1ea97f0e 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -251,6 +251,7 @@ typedef struct BDRVQcow2State {
int cluster_bits;
int cluster_size;
int cluster_sectors;
+ int l2_slice_size;
int l2_bits;
int l2_size;
int l1_size;
--
2.11.0
- [Qemu-devel] [PATCH 07/31] qcow2: Remove BDS parameter from qcow2_cache_put(), (continued)
- [Qemu-devel] [PATCH 07/31] qcow2: Remove BDS parameter from qcow2_cache_put(), Alberto Garcia, 2017/10/12
- [Qemu-devel] [PATCH 16/31] qcow2: Update l2_allocate() to support L2 slices, Alberto Garcia, 2017/10/12
- [Qemu-devel] [PATCH 11/31] qcow2: Remove BDS parameter from qcow2_cache_is_table_offset(), Alberto Garcia, 2017/10/12
- [Qemu-devel] [PATCH 06/31] qcow2: Remove BDS parameter from qcow2_cache_entry_mark_dirty(), Alberto Garcia, 2017/10/12
- [Qemu-devel] [PATCH 15/31] qcow2: Update l2_load() to support L2 slices, Alberto Garcia, 2017/10/12
- [Qemu-devel] [PATCH 05/31] qcow2: Remove BDS parameter from qcow2_cache_table_release(), Alberto Garcia, 2017/10/12
- [Qemu-devel] [PATCH 14/31] qcow2: Add offset_to_l2_slice_index(), Alberto Garcia, 2017/10/12
- [Qemu-devel] [PATCH 09/31] qcow2: Remove BDS parameter from qcow2_cache_clean_unused(), Alberto Garcia, 2017/10/12
- [Qemu-devel] [PATCH 17/31] qcow2: Update get_cluster_table() to support L2 slices, Alberto Garcia, 2017/10/12
- [Qemu-devel] [PATCH 04/31] qcow2: Remove BDS parameter from qcow2_cache_get_table_idx(), Alberto Garcia, 2017/10/12
- [Qemu-devel] [PATCH 13/31] qcow2: Add l2_slice_size field to BDRVQcow2State,
Alberto Garcia <=
- [Qemu-devel] [PATCH 03/31] qcow2: Remove BDS parameter from qcow2_cache_get_table_addr(), Alberto Garcia, 2017/10/12
- [Qemu-devel] [PATCH 01/31] qcow2: Fix documentation of get_cluster_table(), Alberto Garcia, 2017/10/12
- Re: [Qemu-devel] [PATCH 00/31] Allow configuring the qcow2 L2 cache entry size, no-reply, 2017/10/12
- Re: [Qemu-devel] [PATCH 00/31] Allow configuring the qcow2 L2 cache entry size, no-reply, 2017/10/12