From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VePPx-00075T-FM for qemu-devel@nongnu.org; Thu, 07 Nov 2013 08:14:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VePPs-0006F0-Ap for qemu-devel@nongnu.org; Thu, 07 Nov 2013 08:14:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9610) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VePPs-0006Et-3I for qemu-devel@nongnu.org; Thu, 07 Nov 2013 08:14:32 -0500 From: Stefan Hajnoczi Date: Thu, 7 Nov 2013 14:12:25 +0100 Message-Id: <1383829964-32364-18-git-send-email-stefanha@redhat.com> In-Reply-To: <1383829964-32364-1-git-send-email-stefanha@redhat.com> References: <1383829964-32364-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 17/36] block/vpc: fix virtual size for images created with disk2vhd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Lieven , Stefan Hajnoczi , Anthony Liguori From: Peter Lieven 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 627d11c..577cc45 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; -- 1.8.3.1