|
 |
0a122b |
From d133282ff639fd022fe64172f89b203cf8669114 Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
0a122b |
Date: Fri, 7 Feb 2014 16:00:09 +0100
|
|
|
0a122b |
Subject: [PATCH 37/37] block: Don't call ROUND_UP with negative values
|
|
|
0a122b |
|
|
|
0a122b |
Message-id: <1392117622-28812-37-git-send-email-kwolf@redhat.com>
|
|
|
0a122b |
Patchwork-id: 57201
|
|
|
0a122b |
O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 37/37] block: Don't call ROUND_UP with negative values
|
|
|
0a122b |
Bugzilla: 748906
|
|
|
0a122b |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
The behaviour of the ROUND_UP macro with negative numbers isn't obvious.
|
|
|
0a122b |
It happens to do the right thing in this please, but better avoid it.
|
|
|
0a122b |
|
|
|
0a122b |
Suggested-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
0a122b |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
0a122b |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
0a122b |
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
0a122b |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
block.c | 4 ++--
|
|
|
0a122b |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
0a122b |
---
|
|
|
0a122b |
block.c | 4 ++--
|
|
|
0a122b |
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/block.c b/block.c
|
|
|
0a122b |
index b878c8b..1b57236 100644
|
|
|
0a122b |
--- a/block.c
|
|
|
0a122b |
+++ b/block.c
|
|
|
0a122b |
@@ -2760,8 +2760,8 @@ static int coroutine_fn bdrv_aligned_preadv(BlockDriverState *bs,
|
|
|
0a122b |
}
|
|
|
0a122b |
|
|
|
0a122b |
total_sectors = DIV_ROUND_UP(len, BDRV_SECTOR_SIZE);
|
|
|
0a122b |
- max_nb_sectors = MAX(0, ROUND_UP(total_sectors - sector_num,
|
|
|
0a122b |
- align >> BDRV_SECTOR_BITS));
|
|
|
0a122b |
+ max_nb_sectors = ROUND_UP(MAX(0, total_sectors - sector_num),
|
|
|
0a122b |
+ align >> BDRV_SECTOR_BITS);
|
|
|
0a122b |
if (max_nb_sectors > 0) {
|
|
|
0a122b |
ret = drv->bdrv_co_readv(bs, sector_num,
|
|
|
0a122b |
MIN(nb_sectors, max_nb_sectors), qiov);
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.1
|
|
|
0a122b |
|