From owner-svn-src-user@FreeBSD.ORG Thu May 15 03:18:22 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5F4780B; Thu, 15 May 2014 03:18:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B46D1293E; Thu, 15 May 2014 03:18:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4F3IMKr022533; Thu, 15 May 2014 03:18:22 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4F3IMst022532; Thu, 15 May 2014 03:18:22 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201405150318.s4F3IMst022532@svn.freebsd.org> From: Marcel Moolenaar Date: Thu, 15 May 2014 03:18:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r266112 - user/marcel/mkimg X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 May 2014 03:18:22 -0000 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",