svn commit: r266112 - user/marcel/mkimg

[Marcel Moolenaar]

Author: marcel
Date: Thu May 15 03:18:22 2014
New Revision: 266112
URL: http://svnweb.freebsd.org/changeset/base/266112

Log:
  As it appears the image must be rounded to the nearest megabyte,

Modified:
  user/marcel/mkimg/vmdk.c

Modified: user/marcel/mkimg/vmdk.c
==============================================================================
--- user/marcel/mkimg/vmdk.c	Thu May 15 03:08:20 2014	(r266111)
+++ user/marcel/mkimg/vmdk.c	Thu May 15 03:18:22 2014	(r266112)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include "format.h"
 #include "mkimg.h"
 
+#define	VMDK_IMAGE_ROUND	1048576
 #define	VMDK_MIN_GRAIN_SIZE	8192
 #define	VMDK_SECTOR_SIZE	512
 
@@ -95,8 +96,8 @@ vmdk_resize(lba_t imgsz)
 	uint64_t imagesz;
 
 	imagesz = imgsz * secsz;
+	imagesz = (imagesz + VMDK_IMAGE_ROUND - 1) & ~(VMDK_IMAGE_ROUND - 1);
 	grainsz = (blksz < VMDK_MIN_GRAIN_SIZE) ? VMDK_MIN_GRAIN_SIZE : blksz;
-	imagesz = (imagesz + grainsz - 1) & ~(grainsz - 1);
 
 	if (verbose)
 		fprintf(stderr, "VMDK: image size = %ju, grain size = %ju\n",