[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/18] block: Don't call ROUND_UP with negative value
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 16/18] block: Don't call ROUND_UP with negative values |
Date: |
Sun, 9 Feb 2014 09:46:28 +0100 |
The behaviour of the ROUND_UP macro with negative numbers isn't obvious.
It happens to do the right thing in this please, but better avoid it.
Suggested-by: Laszlo Ersek <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
---
block.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index a027823..b0c5025 100644
--- a/block.c
+++ b/block.c
@@ -2915,8 +2915,8 @@ static int coroutine_fn
bdrv_aligned_preadv(BlockDriverState *bs,
}
total_sectors = DIV_ROUND_UP(len, BDRV_SECTOR_SIZE);
- max_nb_sectors = MAX(0, ROUND_UP(total_sectors - sector_num,
- align >> BDRV_SECTOR_BITS));
+ max_nb_sectors = ROUND_UP(MAX(0, total_sectors - sector_num),
+ align >> BDRV_SECTOR_BITS);
if (max_nb_sectors > 0) {
ret = drv->bdrv_co_readv(bs, sector_num,
MIN(nb_sectors, max_nb_sectors), qiov);
--
1.8.1.4
- [Qemu-devel] [PULL 06/18] qemu-iotests: enable support for NFS protocol, (continued)
- [Qemu-devel] [PULL 06/18] qemu-iotests: enable support for NFS protocol, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 08/18] block/iscsi: always fill bs->bl.opt_transfer_length, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 09/18] qcow2: remove n_start and n_end of qcow2_alloc_cluster_offset(), Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 07/18] block: Fail gracefully with missing filename, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 10/18] qcow2: fix offset overflow in qcow2_alloc_clusters_at(), Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 11/18] qcow2: check for NULL l2meta, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 12/18] qemu-iotests: add test for qcow2 preallocation with different cluster sizes, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 13/18] raw: Fix BlockLimits passthrough, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 14/18] block: Fix memory leaks in bdrv_co_do_pwritev(), Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 15/18] block: bdrv_aligned_pwritev: Assert overlap range, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 16/18] block: Don't call ROUND_UP with negative values,
Kevin Wolf <=
- [Qemu-devel] [PULL 17/18] blkdebug: Don't leak bs->file on failure, Kevin Wolf, 2014/02/09
- [Qemu-devel] [PULL 18/18] block: Fix 32 bit truncation in mark_request_serialising(), Kevin Wolf, 2014/02/09
- Re: [Qemu-devel] [PULL 00/18] Block patches, Peter Maydell, 2014/02/12