From: Kevin Wolf Date: Wed, 11 Feb 2015 16:19:57 +0000 (+0100) Subject: vpc: Fix size in fixed image creation X-Git-Tag: qemu-xen-4.6.0-rc1~34^2~1 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c70221df1f89953e85a3f1f96ceefbd6888bb55f;p=qemu-upstream-4.6-testing.git vpc: Fix size in fixed image creation If total_sectors is rounded to match the geometry, total_size needs to be changed as well. Otherwise we end up with an image whose geometry describes a disk larger than the image file, which doesn't end well. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz (cherry picked from commit c7dd631d482912fd615a9ef18a0e0691e7a84836) Signed-off-by: Michael Roth --- diff --git a/block/vpc.c b/block/vpc.c index 38c4f02ff..40baa6438 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -801,6 +801,7 @@ static int vpc_create(const char *filename, QemuOpts *opts, Error **errp) } total_sectors = (int64_t) cyls * heads * secs_per_cyl; + total_size = total_sectors * BDRV_SECTOR_SIZE; /* Prepare the Hard Disk Footer */ memset(buf, 0, 1024); @@ -822,13 +823,8 @@ static int vpc_create(const char *filename, QemuOpts *opts, Error **errp) /* Version of Virtual PC 2007 */ footer->major = cpu_to_be16(0x0005); footer->minor = cpu_to_be16(0x0003); - if (disk_type == VHD_DYNAMIC) { - footer->orig_size = cpu_to_be64(total_sectors * 512); - footer->size = cpu_to_be64(total_sectors * 512); - } else { - footer->orig_size = cpu_to_be64(total_size); - footer->size = cpu_to_be64(total_size); - } + footer->orig_size = cpu_to_be64(total_size); + footer->size = cpu_to_be64(total_size); footer->cyls = cpu_to_be16(cyls); footer->heads = heads; footer->secs_per_cyl = secs_per_cyl;