From patchwork Mon Oct 21 14:00:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 285215 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7798E2C00BC for ; Tue, 22 Oct 2013 01:01:52 +1100 (EST) Received: from localhost ([::1]:40182 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYG3J-0001CK-Ut for incoming@patchwork.ozlabs.org; Mon, 21 Oct 2013 10:01:49 -0400 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 Received: (qmail 32355 invoked by uid 89); 21 Oct 2013 14:01:22 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98/17984. hbedv: 8.2.12.132/7.11.108.198. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/4.0):. Processed in 1.099351 secs); 21 Oct 2013 14:01:22 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 21 Oct 2013 14:01:21 -0000 X-GL_Whitelist: yes Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id 8EDBD20688; Mon, 21 Oct 2013 16:00:31 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 21E295FD0A; Mon, 21 Oct 2013 16:00:31 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Mon, 21 Oct 2013 16:00:18 +0200 Message-Id: <1382364019-15651-1-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: kwolf@redhat.com, aliguori@us.ibm.com, jcody@redhat.com, Peter Lieven , stefanha@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH] block/vpc: fix virtual size for images created with disk2vhd X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;