diff options
| author |   Kevin Wolf <kwolf@redhat.com> | 2010-02-02 15:20:57 +0100 |
|---|---|---|
| committer |   Anthony Liguori <aliguori@us.ibm.com> | 2010-02-23 14:07:57 -0600 |
| commit | 8d67694fbf6eaa7400a0a9af5f8b7b55eaa28b14 (patch) | |
| tree | 66a1253c10a425794a8f70dde876662273d6ed82 /block | |
| parent | Do not ignore error, if open file failed (-serial /dev/tty) (diff) | |
| download | qemu-kvm-8d67694fbf6eaa7400a0a9af5f8b7b55eaa28b14.tar.gz qemu-kvm-8d67694fbf6eaa7400a0a9af5f8b7b55eaa28b14.tar.bz2 qemu-kvm-8d67694fbf6eaa7400a0a9af5f8b7b55eaa28b14.zip | |
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>
(cherry picked from commit f4f0d391b26afcce86df85566788be7170127116)
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2-cluster.c | 12 | ||||
| -rw-r--r-- | block/qcow2.h | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 4e30d161a..3501a9429 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -219,7 +219,8 @@ static uint64_t *l2_allocate(BlockDriverState *bs, int l1_index) BDRVQcowState *s = bs->opaque; int min_index; 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]; @@ -560,7 +561,8 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs, { BDRVQcowState *s = bs->opaque; 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; 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 */ -uint64_t qcow2_alloc_cluster_offset(BlockDriverState *bs, - uint64_t offset, - int n_start, int n_end, - int *num, QCowL2Meta *m) +int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset, + int n_start, int n_end, int *num, QCowL2Meta *m) { BDRVQcowState *s = bs->opaque; int l2_index, ret; diff --git a/block/qcow2.h b/block/qcow2.h index d9ea6abc5..de9397a3d 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -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, int *num); -uint64_t qcow2_alloc_cluster_offset(BlockDriverState *bs, - uint64_t offset, - int n_start, int n_end, - int *num, QCowL2Meta *m); +int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset, + int n_start, int n_end, int *num, QCowL2Meta *m); uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs, uint64_t offset, int compressed_size); |