From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYG31-0001C5-QW for qemu-devel@nongnu.org; Mon, 21 Oct 2013 10:01:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VYG2v-0005Js-RA for qemu-devel@nongnu.org; Mon, 21 Oct 2013 10:01:31 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:54030 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYG2v-0005JR-EW for qemu-devel@nongnu.org; Mon, 21 Oct 2013 10:01:25 -0400 From: Peter Lieven Date: Mon, 21 Oct 2013 16:00:18 +0200 Message-Id: <1382364019-15651-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH] 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: kwolf@redhat.com, aliguori@us.ibm.com, jcody@redhat.com, Peter Lieven , stefanha@redhat.com, pbonzini@redhat.com Signed-off-by: Peter Lieven --- block/vpc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/block/vpc.c b/block/vpc.c index b5dca39..1acc1d4 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.7.9.5