From patchwork Sat Mar 19 19:42:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 599786 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qSCDv5fnRz9s9G for ; Sun, 20 Mar 2016 06:43:11 +1100 (AEDT) Received: from localhost ([::1]:50208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahMmD-0007lT-Pz for incoming@patchwork.ozlabs.org; Sat, 19 Mar 2016 15:43:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahMly-0007Et-JO for qemu-devel@nongnu.org; Sat, 19 Mar 2016 15:42:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahMlx-0008F6-Pb for qemu-devel@nongnu.org; Sat, 19 Mar 2016 15:42:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43152) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahMlr-00089J-Qf; Sat, 19 Mar 2016 15:42:47 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 3BEA485A02; Sat, 19 Mar 2016 19:42:46 +0000 (UTC) Received: from localhost (ovpn-112-21.ams2.redhat.com [10.36.112.21]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2JJgi0G009322; Sat, 19 Mar 2016 15:42:45 -0400 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Sat, 19 Mar 2016 19:42:43 +0000 Message-Id: <1458416563-4381-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: grantwwu@gmail.com, sbaugh@catern.com, Stefan Hajnoczi , qemu-block@nongnu.org, Kevin Wolf Subject: [Qemu-devel] [PATCH] vpc: use current_size field for XenServer VHD images 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 The vpc driver has two methods of determining virtual disk size. The correct one to use depends on the software that generated the image file. Add the XenServer creator_app signature so that image size is correctly detected for those images. Reported-by: Grant Wu Reported-by: Spencer Baugh Signed-off-by: Stefan Hajnoczi --- block/vpc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/vpc.c b/block/vpc.c index 8435205..7517f75 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -298,6 +298,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, * 'qem2' : current_size QEMU (uses current_size) * 'win ' : current_size Hyper-V * 'd2v ' : current_size Disk2vhd + * 'tap\0' : current_size XenServer * * The user can override the table values via drive options, however * even with an override we will still use current_size for images @@ -305,7 +306,8 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, */ use_chs = (!!strncmp(footer->creator_app, "win ", 4) && !!strncmp(footer->creator_app, "qem2", 4) && - !!strncmp(footer->creator_app, "d2v ", 4)) || s->force_use_chs; + !!strncmp(footer->creator_app, "d2v ", 4) && + !!memcmp(footer->creator_app, "tap", 4)) || s->force_use_chs; if (!use_chs || bs->total_sectors == VHD_MAX_GEOMETRY || s->force_use_sz) { bs->total_sectors = be64_to_cpu(footer->current_size) /