mirror of https://gitee.com/openkylin/qemu.git
qcow2: Fix signedness bugs
Checking for return codes < 0 isn't really going to work with unsigned types. Use signed types instead. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
9bc378c143
commit
f4f0d391b2
|
@ -219,7 +219,8 @@ static uint64_t *l2_allocate(BlockDriverState *bs, int l1_index)
|
||||||
BDRVQcowState *s = bs->opaque;
|
BDRVQcowState *s = bs->opaque;
|
||||||
int min_index;
|
int min_index;
|
||||||
uint64_t old_l2_offset;
|
uint64_t old_l2_offset;
|
||||||
uint64_t *l2_table, l2_offset;
|
uint64_t *l2_table;
|
||||||
|
int64_t l2_offset;
|
||||||
|
|
||||||
old_l2_offset = s->l1_table[l1_index];
|
old_l2_offset = s->l1_table[l1_index];
|
||||||
|
|
||||||
|
@ -560,7 +561,8 @@ 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, cluster_offset;
|
uint64_t l2_offset, *l2_table;
|
||||||
|
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_offset, &l2_index);
|
||||||
|
@ -704,10 +706,8 @@ err:
|
||||||
*
|
*
|
||||||
* Return 0 on success and -errno in error cases
|
* Return 0 on success and -errno in error cases
|
||||||
*/
|
*/
|
||||||
uint64_t qcow2_alloc_cluster_offset(BlockDriverState *bs,
|
int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset,
|
||||||
uint64_t offset,
|
int n_start, int n_end, int *num, QCowL2Meta *m)
|
||||||
int n_start, int n_end,
|
|
||||||
int *num, QCowL2Meta *m)
|
|
||||||
{
|
{
|
||||||
BDRVQcowState *s = bs->opaque;
|
BDRVQcowState *s = bs->opaque;
|
||||||
int l2_index, ret;
|
int l2_index, ret;
|
||||||
|
|
|
@ -192,10 +192,8 @@ void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num,
|
||||||
|
|
||||||
uint64_t qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset,
|
uint64_t qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset,
|
||||||
int *num);
|
int *num);
|
||||||
uint64_t qcow2_alloc_cluster_offset(BlockDriverState *bs,
|
int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset,
|
||||||
uint64_t offset,
|
int n_start, int n_end, int *num, QCowL2Meta *m);
|
||||||
int n_start, int n_end,
|
|
||||||
int *num, QCowL2Meta *m);
|
|
||||||
uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
|
uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
|
||||||
uint64_t offset,
|
uint64_t offset,
|
||||||
int compressed_size);
|
int compressed_size);
|
||||||
|
|
Loading…
Reference in New Issue