File 0061-Don-t-change-total_size-when-creati.patch of Package qemu-testsuite.5922

Overview Repositories Revisions Requests Users Attributes Meta

File 0061-Don-t-change-total_size-when-creati.patch of Package qemu-testsuite.5922

From 34567062970b79cbfdde50c13cd975ef3164b4ab Mon Sep 17 00:00:00 2001
From: Chunyan Liu <cyliu@suse.com>
Date: Fri, 28 Aug 2015 13:16:28 +0800
Subject: [PATCH] Don't change total_size when creating fixed vpc

After upstream commit #3f3f20d... vpc: Fix size in fixed image
creation. Total_sectors is rounded up to match the geometry,
total_size is also changed as well (Total_sectors * BDRV_SECTOR_SIZE).
This brings problem for bnc#943446 - qemu-img convert doesn't create
MB aligned VHDs anymore. Add patch to exclude the change.

Signed-off-by: Chunyan Liu <cyliu@suse.com>
[BR: BSC#943446]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
 block/vpc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/block/vpc.c b/block/vpc.c
index 8ab30d6002..496114678b 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -823,7 +823,9 @@ static int vpc_create(const char *filename, QemuOpts *opts, Error **errp)
         }
     } else {
         total_sectors = (int64_t)cyls * heads * secs_per_cyl;
-        total_size = total_sectors * BDRV_SECTOR_SIZE;
+        if (disk_type != VHD_FIXED) {
+            total_size = total_sectors * BDRV_SECTOR_SIZE;
+        }
     }
 
     /* Prepare the Hard Disk Footer */

Places

File 0061-Don-t-change-total_size-when-creati.patch of Package qemu-testsuite.5922

Places