motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qcow2: Remove BDS parameter from qcow2_cache_is_table_offset()

Browse source 
This function was only using the BlockDriverState parameter to pass it
to qcow2_cache_get_table_addr(). This is no longer necessary so this
parameter can be removed.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: eb0ed90affcf302e5a954bafb5931b5215483d3a.1517840877.git.berto@igalia.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Alberto Garcia 2018-02-05 16:33:11 +02:00 • committed by Max Reitz
parent 77aadd7bed
commit 6e6fa7605e
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
block/qcow2-cache.c
View file

@ -428,8 +428,7 @@ void qcow2_cache_entry_mark_dirty(Qcow2Cache *c, void *table)
c->entries[i].dirty = true; c->entries[i].dirty = true;
} }
void *qcow2_cache_is_table_offset(BlockDriverState *bs, Qcow2Cache *c, void *qcow2_cache_is_table_offset(Qcow2Cache *c, uint64_t offset)
uint64_t offset)
{ {
int i; int i;

6
block/qcow2-refcount.c
View file

@ -871,14 +871,14 @@ static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
if (refcount == 0) { if (refcount == 0) {
void *table; void *table;
table = qcow2_cache_is_table_offset(bs, s->refcount_block_cache, table = qcow2_cache_is_table_offset(s->refcount_block_cache,
offset); offset);
if (table != NULL) { if (table != NULL) {
qcow2_cache_put(s->refcount_block_cache, &refcount_block); qcow2_cache_put(s->refcount_block_cache, &refcount_block);
qcow2_cache_discard(s->refcount_block_cache, table); qcow2_cache_discard(s->refcount_block_cache, table);
} }
table = qcow2_cache_is_table_offset(bs, s->l2_table_cache, offset); table = qcow2_cache_is_table_offset(s->l2_table_cache, offset);
if (table != NULL) { if (table != NULL) {
qcow2_cache_discard(s->l2_table_cache, table); qcow2_cache_discard(s->l2_table_cache, table);
} }
@ -3186,7 +3186,7 @@ static int qcow2_discard_refcount_block(BlockDriverState *bs,
s->free_cluster_index = cluster_index; s->free_cluster_index = cluster_index;
} }
refblock = qcow2_cache_is_table_offset(bs, s->refcount_block_cache, refblock = qcow2_cache_is_table_offset(s->refcount_block_cache,
discard_block_offs); discard_block_offs);
if (refblock) { if (refblock) {
/* discard refblock from the cache if refblock is cached */ /* discard refblock from the cache if refblock is cached */

3
block/qcow2.h
View file

@ -654,8 +654,7 @@ int qcow2_cache_get(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
int qcow2_cache_get_empty(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset, int qcow2_cache_get_empty(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
void **table); void **table);
void qcow2_cache_put(Qcow2Cache *c, void **table); void qcow2_cache_put(Qcow2Cache *c, void **table);
void *qcow2_cache_is_table_offset(BlockDriverState *bs, Qcow2Cache *c, void *qcow2_cache_is_table_offset(Qcow2Cache *c, uint64_t offset);
uint64_t offset);
void qcow2_cache_discard(Qcow2Cache *c, void *table); void qcow2_cache_discard(Qcow2Cache *c, void *table);
/* qcow2-bitmap.c functions */ /* qcow2-bitmap.c functions */