Received: from eggs.gnu.org ([2001:4830:134:3::10]:38844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsTy7-0002hF-Oq for qemu-devel@nongnu.org; Fri, 28 Jun 2013 04:23:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsTy6-00074S-IV for qemu-devel@nongnu.org; Fri, 28 Jun 2013 04:23:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35505) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsTy6-00074M-AZ for qemu-devel@nongnu.org; Fri, 28 Jun 2013 04:23:46 -0400 From: Kevin Wolf Date: Fri, 28 Jun 2013 10:23:39 +0200 Message-Id: <1372407819-12744-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] vpc: Implement .bdrv_has_zero_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pl@kamp.de Depending on the subformat, has_zero_init on VHD must behave like raw and query the underlying storage (fixed) or like other sparse formats that can always return 1 (dynamic, differencing). Signed-off-by: Kevin Wolf --- block/vpc.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/block/vpc.c b/block/vpc.c index 3cad52e..fe4f311 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -786,6 +786,18 @@ static int vpc_create(const char *filename, QEMUOptionParameter *options) return ret; } +static int vpc_has_zero_init(BlockDriverState *bs) +{ + BDRVVPCState *s = bs->opaque; + struct vhd_footer *footer = (struct vhd_footer *) s->footer_buf; + + if (cpu_to_be32(footer->type) == VHD_FIXED) { + return bdrv_has_zero_init(bs->file); + } else { + return 1; + } +} + static void vpc_close(BlockDriverState *bs) { BDRVVPCState *s = bs->opaque; @@ -818,16 +830,17 @@ static BlockDriver bdrv_vpc = { .format_name = "vpc", .instance_size = sizeof(BDRVVPCState), - .bdrv_probe = vpc_probe, - .bdrv_open = vpc_open, - .bdrv_close = vpc_close, - .bdrv_reopen_prepare = vpc_reopen_prepare, - .bdrv_create = vpc_create, + .bdrv_probe = vpc_probe, + .bdrv_open = vpc_open, + .bdrv_close = vpc_close, + .bdrv_reopen_prepare = vpc_reopen_prepare, + .bdrv_create = vpc_create, .bdrv_read = vpc_co_read, .bdrv_write = vpc_co_write, - .create_options = vpc_create_options, + .create_options = vpc_create_options, + .bdrv_has_zero_init = vpc_has_zero_init, }; static void bdrv_vpc_init(void) -- 1.8.1.4