From: Stefan Hajnoczi Date: Wed, 23 Mar 2016 03:33:39 +0000 (-0400) Subject: vpc: use current_size field for XenServer VHD images X-Git-Tag: v2.7.1~386^2~8 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9bdfb9e8ac9ae3171f0fba4635afda5c90db2a1e;p=mirror_qemu.git vpc: use current_size field for XenServer VHD images 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 Signed-off-by: Jeff Cody Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- diff --git a/block/vpc.c b/block/vpc.c index 5aded1a18b..228f2c96e1 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -299,6 +299,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 @@ -306,7 +307,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) /