diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2015-02-11 17:19:57 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-03-09 11:11:59 +0100 |
| commit | 3f3f20dcd34fc2fcf6dea2fe4e9b45d1c4d67288 (patch) | |
| tree | b746ac7b76df5f160f39c522023bde3a47527812 | |
| parent | 7c2eed3efa86c19436bc33372bfa9d7fbb6fda2c (diff) | |
| download | focaccia-qemu-3f3f20dcd34fc2fcf6dea2fe4e9b45d1c4d67288.tar.gz focaccia-qemu-3f3f20dcd34fc2fcf6dea2fe4e9b45d1c4d67288.zip | |
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 <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
| -rw-r--r-- | block/vpc.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/block/vpc.c b/block/vpc.c index 46803b14be..7fddbf0b75 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; |