[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 03/39] qcow2: Remove BDS parameter from qcow2_cac
From: |
Alberto Garcia |
Subject: |
[Qemu-devel] [PATCH v4 03/39] qcow2: Remove BDS parameter from qcow2_cache_get_table_addr() |
Date: |
Mon, 5 Feb 2018 16:33:03 +0200 |
This function was only using the BlockDriverState parameter to get the
cache table size (since it was equal to the cluster size). This is no
longer necessary so this parameter can be removed.
Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/qcow2-cache.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c
index 38c03770b4..a481ef499a 100644
--- a/block/qcow2-cache.c
+++ b/block/qcow2-cache.c
@@ -46,8 +46,7 @@ struct Qcow2Cache {
uint64_t cache_clean_lru_counter;
};
-static inline void *qcow2_cache_get_table_addr(BlockDriverState *bs,
- Qcow2Cache *c, int table)
+static inline void *qcow2_cache_get_table_addr(Qcow2Cache *c, int table)
{
return (uint8_t *) c->table_array + (size_t) table * c->table_size;
}
@@ -78,7 +77,7 @@ static void qcow2_cache_table_release(BlockDriverState *bs,
Qcow2Cache *c,
{
/* Using MADV_DONTNEED to discard memory is a Linux-specific feature */
#ifdef CONFIG_LINUX
- void *t = qcow2_cache_get_table_addr(bs, c, i);
+ void *t = qcow2_cache_get_table_addr(c, i);
int align = getpagesize();
size_t mem_size = (size_t) c->table_size * num_tables;
size_t offset = QEMU_ALIGN_UP((uintptr_t) t, align) - (uintptr_t) t;
@@ -222,7 +221,7 @@ static int qcow2_cache_entry_flush(BlockDriverState *bs,
Qcow2Cache *c, int i)
}
ret = bdrv_pwrite(bs->file, c->entries[i].offset,
- qcow2_cache_get_table_addr(bs, c, i), c->table_size);
+ qcow2_cache_get_table_addr(c, i), c->table_size);
if (ret < 0) {
return ret;
}
@@ -378,7 +377,7 @@ static int qcow2_cache_do_get(BlockDriverState *bs,
Qcow2Cache *c,
}
ret = bdrv_pread(bs->file, offset,
- qcow2_cache_get_table_addr(bs, c, i),
+ qcow2_cache_get_table_addr(c, i),
c->table_size);
if (ret < 0) {
return ret;
@@ -390,7 +389,7 @@ static int qcow2_cache_do_get(BlockDriverState *bs,
Qcow2Cache *c,
/* And return the right table */
found:
c->entries[i].ref++;
- *table = qcow2_cache_get_table_addr(bs, c, i);
+ *table = qcow2_cache_get_table_addr(c, i);
trace_qcow2_cache_get_done(qemu_coroutine_self(),
c == s->l2_table_cache, i);
@@ -439,7 +438,7 @@ void *qcow2_cache_is_table_offset(BlockDriverState *bs,
Qcow2Cache *c,
for (i = 0; i < c->size; i++) {
if (c->entries[i].offset == offset) {
- return qcow2_cache_get_table_addr(bs, c, i);
+ return qcow2_cache_get_table_addr(c, i);
}
}
return NULL;
--
2.11.0
- [Qemu-devel] [PATCH v4 06/39] qcow2: Remove BDS parameter from qcow2_cache_entry_mark_dirty(), (continued)
- [Qemu-devel] [PATCH v4 06/39] qcow2: Remove BDS parameter from qcow2_cache_entry_mark_dirty(), Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 08/39] qcow2: Remove BDS parameter from qcow2_cache_destroy(), Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 35/39] qcow2: Rename l2_table in count_cow_clusters(), Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 10/39] qcow2: Remove BDS parameter from qcow2_cache_discard(), Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 07/39] qcow2: Remove BDS parameter from qcow2_cache_put(), Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 15/39] qcow2: Update l2_load() to support L2 slices, Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 20/39] qcow2: Update qcow2_get_cluster_offset() to support L2 slices, Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 13/39] qcow2: Add l2_slice_size field to BDRVQcow2State, Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 11/39] qcow2: Remove BDS parameter from qcow2_cache_is_table_offset(), Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 12/39] qcow2: Add offset_to_l1_index(), Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 03/39] qcow2: Remove BDS parameter from qcow2_cache_get_table_addr(),
Alberto Garcia <=
- [Qemu-devel] [PATCH v4 01/39] qcow2: Fix documentation of get_cluster_table(), Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 09/39] qcow2: Remove BDS parameter from qcow2_cache_clean_unused(), Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 02/39] qcow2: Add table size field to Qcow2Cache, Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 37/39] iotests: Test valid values of l2-cache-entry-size, Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 34/39] qcow2: Rename l2_table in count_contiguous_clusters_unallocated(), Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 38/39] iotests: Test downgrading an image using a small L2 slice size, Alberto Garcia, 2018/02/05
- [Qemu-devel] [PATCH v4 31/39] qcow2: Update qcow2_truncate() to support L2 slices, Alberto Garcia, 2018/02/05