summaryrefslogtreecommitdiff
path: root/block.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2010-07-28 11:26:29 +0200
committerKevin Wolf <kwolf@redhat.com>2010-08-03 15:57:22 +0200
commit336c1c12551ff0a6e1a2af226d6cbdbadd2e02b5 (patch)
tree0f5945db7be86283562c5d86abf3eb36cb4d695c /block.c
parentbd0858bb460c0c134e9a62c73e60e465037b1240 (diff)
downloadqemu-336c1c12551ff0a6e1a2af226d6cbdbadd2e02b5.tar.gz
block: Fix bdrv_has_zero_init
Assuming that any image on a block device is not properly zero-initialized is actually wrong: Only raw images have this problem. Any other image format shouldn't care about it, they initialize everything properly themselves. Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r--block.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/block.c b/block.c
index c4d6814726..a12be0bac1 100644
--- a/block.c
+++ b/block.c
@@ -1477,10 +1477,8 @@ int bdrv_has_zero_init(BlockDriverState *bs)
{
assert(bs->drv);
- if (bs->drv->no_zero_init) {
- return 0;
- } else if (bs->file) {
- return bdrv_has_zero_init(bs->file);
+ if (bs->drv->bdrv_has_zero_init) {
+ return bs->drv->bdrv_has_zero_init(bs);
}
return 1;