aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Lieven <pl@kamp.de>2013-10-21 16:00:18 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2013-11-07 13:58:58 +0100
commit0173e7bbf3c892abd4e35507ddeb2f23c1a44829 (patch)
tree80a0cfb39f6910887bd0b98d7ce6177bdd43addb
parent17826bc159893300a05551d8a830275c5ecf0092 (diff)
downloadqemu-0173e7bbf3c892abd4e35507ddeb2f23c1a44829.tar.gz
block/vpc: fix virtual size for images created with disk2vhd
Signed-off-by: Peter Lieven <pl@kamp.de> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--block/vpc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/block/vpc.c b/block/vpc.c
index 627d11cb9b9..577cc459920 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -211,6 +211,15 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,
bs->total_sectors = (int64_t)
be16_to_cpu(footer->cyls) * footer->heads * footer->secs_per_cyl;
+ /* images created with disk2vhd report a far higher virtual size
+ * than expected with the cyls * heads * sectors_per_cyl formula.
+ * use the footer->size instead if the image was created with
+ * disk2vhd.
+ */
+ if (!strncmp(footer->creator_app, "d2v", 4)) {
+ bs->total_sectors = be64_to_cpu(footer->size) / BDRV_SECTOR_SIZE;
+ }
+
/* Allow a maximum disk size of approximately 2 TB */
if (bs->total_sectors >= 65535LL * 255 * 255) {
ret = -EFBIG;