Merge remote-tracking branch 'afaerber/qom-cpu' into staging

[qemu.git] / block.c

diff --git a/block.c b/block.c
index ba67c0def2eac8cd745e2e6334d8ba64a4f9aa46..50dab8e595fad860c1b524614864320d6adef5eb 100644 (file)
--- a/block.c
+++ b/block.c
@@ -2800,7 +2800,9 @@ int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,
          *
          * [sector_num+x, nr_sectors] allocated.
          */
-        if (n > pnum_inter) {
+        if (n > pnum_inter &&
+            (intermediate == top ||
+             sector_num + pnum_inter < intermediate->total_sectors)) {
             n = pnum_inter;
         }