From 0173e7bbf3c892abd4e35507ddeb2f23c1a44829 Mon Sep 17 00:00:00 2001 From: Peter Lieven Date: Mon, 21 Oct 2013 16:00:18 +0200 Subject: [PATCH] block/vpc: fix virtual size for images created with disk2vhd Signed-off-by: Peter Lieven Signed-off-by: Stefan Hajnoczi --- block/vpc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/block/vpc.c b/block/vpc.c index 627d11cb9b..577cc45992 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -211,6 +211,15 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, bs->total_sectors = (int64_t) be16_to_cpu(footer->cyls) * footer->heads * footer->secs_per_cyl; + /* images created with disk2vhd report a far higher virtual size + * than expected with the cyls * heads * sectors_per_cyl formula. + * use the footer->size instead if the image was created with + * disk2vhd. + */ + if (!strncmp(footer->creator_app, "d2v", 4)) { + bs->total_sectors = be64_to_cpu(footer->size) / BDRV_SECTOR_SIZE; + } + /* Allow a maximum disk size of approximately 2 TB */ if (bs->total_sectors >= 65535LL * 255 * 255) { ret = -EFBIG; -- GitLab