[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/21] block: do not use ->total_sectors in bdrv_
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v4 06/21] block: do not use ->total_sectors in bdrv_co_is_allocated |
Date: |
Thu, 29 Aug 2013 16:00:06 +0200 |
This is more robust when the device has removable media.
Signed-off-by: Paolo Bonzini <address@hidden>
---
block.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index fc5ea56..bef7d37 100644
--- a/block.c
+++ b/block.c
@@ -2991,9 +2991,15 @@ static int coroutine_fn
bdrv_co_is_allocated(BlockDriverState *bs,
int64_t sector_num,
int nb_sectors, int *pnum)
{
+ int64_t length;
int64_t n;
- if (sector_num >= bs->total_sectors) {
+ length = bdrv_getlength(bs);
+ if (length < 0) {
+ return length;
+ }
+
+ if (sector_num >= (length >> BDRV_SECTOR_BITS)) {
*pnum = 0;
return 0;
}
--
1.8.3.1
- [Qemu-devel] [PATCH v4 01/21] cow: make reads go at a decent speed, (continued)
- [Qemu-devel] [PATCH v4 01/21] cow: make reads go at a decent speed, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 02/21] cow: make writes go at a less indecent speed, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 03/21] cow: do not call bdrv_co_is_allocated, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 04/21] block: keep bs->total_sectors up to date even for growable block devices, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 05/21] block: make bdrv_co_is_allocated static, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 08/21] block: expect errors from bdrv_co_is_allocated, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 06/21] block: do not use ->total_sectors in bdrv_co_is_allocated,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v4 07/21] block: remove bdrv_is_allocated_above/bdrv_co_is_allocated_above distinction, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 09/21] qemu-img: always probe the input image for allocated sectors, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 10/21] block: make bdrv_has_zero_init return false for copy-on-write-images, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 13/21] block: return get_block_status data and flags for formats, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 11/21] block: introduce bdrv_get_block_status API, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 12/21] block: define get_block_status return value, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 14/21] block: use bdrv_has_zero_init to return BDRV_BLOCK_ZERO, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 15/21] block: return BDRV_BLOCK_ZERO past end of backing file, Paolo Bonzini, 2013/08/29