[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/10] raw-posix: Fix .bdrv_co_get_block_status() for
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 02/10] raw-posix: Fix .bdrv_co_get_block_status() for unaligned image size |
Date: |
Fri, 12 Jun 2015 15:57:50 +0100 |
From: Kevin Wolf <address@hidden>
Image files with an unaligned image size have a final hole that starts
at EOF, i.e. in the middle of a sector. Currently, *pnum == 0 is
returned when checking the status of this sector. In qemu-img, this
triggers an assertion failure.
In order to fix this, one type for the sector that contains EOF must be
found. Treating a hole as data is safe, so this patch rounds the
calculated number of data sectors up, so that a partial sector at EOF is
treated as a full data sector.
This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1229394
Signed-off-by: Kevin Wolf <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/raw-posix.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 2990e95..44ade8c 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -1848,8 +1848,9 @@ static int64_t coroutine_fn
raw_co_get_block_status(BlockDriverState *bs,
*pnum = nb_sectors;
ret = BDRV_BLOCK_DATA;
} else if (data == start) {
- /* On a data extent, compute sectors to the end of the extent. */
- *pnum = MIN(nb_sectors, (hole - start) / BDRV_SECTOR_SIZE);
+ /* On a data extent, compute sectors to the end of the extent,
+ * possibly including a partial sector at EOF. */
+ *pnum = MIN(nb_sectors, DIV_ROUND_UP(hole - start, BDRV_SECTOR_SIZE));
ret = BDRV_BLOCK_DATA;
} else {
/* On a hole, compute sectors to the beginning of the next extent. */
--
2.4.2
- [Qemu-devel] [PULL 00/10] Block patches, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 01/10] Revert "iothread: release iothread around aio_poll", Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 05/10] throttle: Add throttle group infrastructure tests, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 02/10] raw-posix: Fix .bdrv_co_get_block_status() for unaligned image size,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 03/10] throttle: Extract timers from ThrottleState into a separate structure, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 04/10] throttle: Add throttle group infrastructure, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 07/10] throttle: acquire the ThrottleGroup lock in bdrv_swap(), Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 06/10] throttle: Add throttle group support, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 08/10] throttle: add the name of the ThrottleGroup to BlockDeviceInfo, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 09/10] throttle: Update throttle infrastructure copyright, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 10/10] qemu-iotests: expand test 093 to support group throttling, Stefan Hajnoczi, 2015/06/12
- Re: [Qemu-devel] [PULL 00/10] Block patches, Peter Maydell, 2015/06/15