|
 |
218e99 |
From 231ea3db5b4c6b9de25fa62b2e6c39ebc4987a6f Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
Date: Fri, 18 Oct 2013 08:14:41 +0200
|
|
|
218e99 |
Subject: [PATCH 16/81] block: return BDRV_BLOCK_ZERO past end of backing file
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
Message-id: <1382084091-16636-17-git-send-email-pbonzini@redhat.com>
|
|
|
218e99 |
Patchwork-id: 54999
|
|
|
218e99 |
O-Subject: [RHEL 7.0 qemu-kvm PATCH 16/26] block: return BDRV_BLOCK_ZERO past end of backing file
|
|
|
218e99 |
Bugzilla: 989646
|
|
|
218e99 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
If the sectors are unallocated and we are past the end of the
|
|
|
218e99 |
backing file, they will read as zero.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
(cherry picked from commit f0ad5712d5d15ff272b9e107910be4aae468fb3d)
|
|
|
218e99 |
---
|
|
|
218e99 |
block.c | 12 ++++++++++--
|
|
|
218e99 |
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
block.c | 12 ++++++++++--
|
|
|
218e99 |
1 files changed, 10 insertions(+), 2 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/block.c b/block.c
|
|
|
218e99 |
index 00bc3b2..36a2f24 100644
|
|
|
218e99 |
--- a/block.c
|
|
|
218e99 |
+++ b/block.c
|
|
|
218e99 |
@@ -3068,8 +3068,16 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
|
|
|
218e99 |
return ret;
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
- if (!(ret & BDRV_BLOCK_DATA) && bdrv_has_zero_init(bs)) {
|
|
|
218e99 |
- ret |= BDRV_BLOCK_ZERO;
|
|
|
218e99 |
+ if (!(ret & BDRV_BLOCK_DATA)) {
|
|
|
218e99 |
+ if (bdrv_has_zero_init(bs)) {
|
|
|
218e99 |
+ ret |= BDRV_BLOCK_ZERO;
|
|
|
218e99 |
+ } else {
|
|
|
218e99 |
+ BlockDriverState *bs2 = bs->backing_hd;
|
|
|
218e99 |
+ int64_t length2 = bdrv_getlength(bs2);
|
|
|
218e99 |
+ if (length2 >= 0 && sector_num >= (length2 >> BDRV_SECTOR_BITS)) {
|
|
|
218e99 |
+ ret |= BDRV_BLOCK_ZERO;
|
|
|
218e99 |
+ }
|
|
|
218e99 |
+ }
|
|
|
218e99 |
}
|
|
|
218e99 |
return ret;
|
|
|
218e99 |
}
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|