Re: [Qemu-devel] [PATCH] block/vpc: fix virtual size for images created with disk2vhd

[Stefan Hajnoczi]

On Mon, Oct 21, 2013 at 04:00:18PM +0200, Peter Lieven wrote:
> Signed-off-by: Peter Lieven 
> ---
>  block/vpc.c |9 +
>  1 file changed, 9 insertions(+)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

[Qemu-devel] [PATCH] block/vpc: fix virtual size for images created with disk2vhd

[Peter Lieven]

Signed-off-by: Peter Lieven 
---
 block/vpc.c |9 +
 1 file changed, 9 insertions(+)

diff --git a/block/vpc.c b/block/vpc.c
index b5dca39..1acc1d4 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;
-- 
1.7.9.5