From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiZYS-0006P1-Jl for qemu-devel@nongnu.org; Tue, 22 Mar 2016 23:33:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiZYR-0003Zs-FV for qemu-devel@nongnu.org; Tue, 22 Mar 2016 23:33:56 -0400 From: Jeff Cody Date: Tue, 22 Mar 2016 23:33:40 -0400 Message-Id: <1c358f5d72892d6b05a33c29e3b3b037e4a72630.1458702790.git.jcody@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH for-2.6 3/7] block/vpc: use current_size field for XenConverter VHD images List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, grantwwu@gmail.com, qemu-devel@nongnu.org, stefanha@redhat.com, sbaugh@catern.com XenConverter VHD images are another VHD image where current_size is different from the CHS values in the the format header. Use current_size as the default, by looking at the creator_app signature field. Signed-off-by: Jeff Cody --- block/vpc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/vpc.c b/block/vpc.c index 8b8b9a7..6ad8406 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -299,6 +299,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, * 'win ' : current_size Hyper-V * 'd2v ' : current_size Disk2vhd * 'tap\0' : current_size XenServer + * 'CTXS' : current_size XenConverter * * The user can override the table values via drive options, however * even with an override we will still use current_size for images @@ -307,6 +308,7 @@ 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) && + !!strncmp(footer->creator_app, "CTXS", 4) && !!memcmp(footer->creator_app, "tap", 4)) || s->force_use_chs; if (!use_chs || bs->total_sectors == VHD_MAX_GEOMETRY || s->force_use_sz) { -- 1.9.3