ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qcow2: Remove unused parameter in get_cluster_table() 

Since everything goes through the cache, callers don't use the L2 table
offset any more.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
Kevin Wolf 2012-03-12 17:46:51 +01:00
parent fa6b8733c9
commit 3948d1d487
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
block/qcow2-cluster.c
View File

@ -466,7 +466,6 @@ out:
*/ */
static int get_cluster_table(BlockDriverState *bs, uint64_t offset, static int get_cluster_table(BlockDriverState *bs, uint64_t offset,
uint64_t **new_l2_table, uint64_t **new_l2_table,
uint64_t *new_l2_offset,
int *new_l2_index) int *new_l2_index)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
@ -514,7 +513,6 @@ static int get_cluster_table(BlockDriverState *bs, uint64_t offset,
l2_index = (offset >> s->cluster_bits) & (s->l2_size - 1); l2_index = (offset >> s->cluster_bits) & (s->l2_size - 1);
*new_l2_table = l2_table; *new_l2_table = l2_table;
*new_l2_offset = l2_offset;
*new_l2_index = l2_index; *new_l2_index = l2_index;
return 0; return 0;
@ -539,11 +537,11 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
int l2_index, ret; int l2_index, ret;
uint64_t l2_offset, *l2_table; uint64_t *l2_table;
int64_t cluster_offset; int64_t cluster_offset;
int nb_csectors; int nb_csectors;
ret = get_cluster_table(bs, offset, &l2_table, &l2_offset, &l2_index); ret = get_cluster_table(bs, offset, &l2_table, &l2_index);
if (ret < 0) { if (ret < 0) {
return 0; return 0;
} }
@ -588,7 +586,7 @@ int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
int i, j = 0, l2_index, ret; int i, j = 0, l2_index, ret;
uint64_t *old_cluster, start_sect, l2_offset, *l2_table; uint64_t *old_cluster, start_sect, *l2_table;
uint64_t cluster_offset = m->alloc_offset; uint64_t cluster_offset = m->alloc_offset;
bool cow = false; bool cow = false;
@ -633,7 +631,7 @@ int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m)
} }
qcow2_cache_set_dependency(bs, s->l2_table_cache, s->refcount_block_cache); qcow2_cache_set_dependency(bs, s->l2_table_cache, s->refcount_block_cache);
ret = get_cluster_table(bs, m->offset, &l2_table, &l2_offset, &l2_index); ret = get_cluster_table(bs, m->offset, &l2_table, &l2_index);
if (ret < 0) { if (ret < 0) {
goto err; goto err;
} }
@ -817,7 +815,7 @@ int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset,
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
int l2_index, ret, sectors; int l2_index, ret, sectors;
uint64_t l2_offset, *l2_table; uint64_t *l2_table;
unsigned int nb_clusters, keep_clusters; unsigned int nb_clusters, keep_clusters;
uint64_t cluster_offset; uint64_t cluster_offset;
@ -825,7 +823,7 @@ int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset,
n_start, n_end); n_start, n_end);
/* Find L2 entry for the first involved cluster */ /* Find L2 entry for the first involved cluster */
ret = get_cluster_table(bs, offset, &l2_table, &l2_offset, &l2_index); ret = get_cluster_table(bs, offset, &l2_table, &l2_index);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -1000,12 +998,12 @@ static int discard_single_l2(BlockDriverState *bs, uint64_t offset,
unsigned int nb_clusters) unsigned int nb_clusters)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
uint64_t l2_offset, *l2_table; uint64_t *l2_table;
int l2_index; int l2_index;
int ret; int ret;
int i; int i;
ret = get_cluster_table(bs, offset, &l2_table, &l2_offset, &l2_index); ret = get_cluster_table(bs, offset, &l2_table, &l2_index);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }