From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 4 Sep 2013 17:00:23 +0000 (+0200)
Subject: block: do not use ->total_sectors in bdrv_co_is_allocated
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=617ccb466e1937a5c99332ce77a47ebd29861ae4;p=qmiga%2Fqemu.git

block: do not use ->total_sectors in bdrv_co_is_allocated

This is more robust when the device has removable media.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/block.c b/block.c
index f27bab6809..4a10fb1a2f 100644
--- a/block.c
+++ b/block.c
@@ -3065,9 +3065,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;
     }