From owner-svn-src-user@FreeBSD.ORG  Thu Jun 26 04:04:54 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 3A2F75FD;
 Thu, 26 Jun 2014 04:04:54 +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 286DD2873;
 Thu, 26 Jun 2014 04:04:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5Q44s4U033725;
 Thu, 26 Jun 2014 04:04:54 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5Q44sfZ033724;
 Thu, 26 Jun 2014 04:04:54 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201406260404.s5Q44sfZ033724@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 26 Jun 2014 04:04:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r267894 - 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 &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jun 2014 04:04:54 -0000

Author: marcel
Date: Thu Jun 26 04:04:53 2014
New Revision: 267894
URL: http://svnweb.freebsd.org/changeset/base/267894

Log:
  Implement vhd_resize(): we round to a multiple of the block size,
  which is 4096 sectors per block or 2M bytes per block.

Modified:
  user/marcel/mkimg/vhd.c

Modified: user/marcel/mkimg/vhd.c
==============================================================================
--- user/marcel/mkimg/vhd.c	Thu Jun 26 03:28:47 2014	(r267893)
+++ user/marcel/mkimg/vhd.c	Thu Jun 26 04:04:53 2014	(r267894)
@@ -51,6 +51,8 @@ __FBSDID("$FreeBSD$");
  * o   The timestamp is seconds since 1/1/2000 12:00:00 AM UTC
  */
 
+#define	VHD_BLOCK_SIZE	4096	/* 2MB blocks */
+
 struct vhd_footer {
 	char		cookie[8];
 #define	VHD_COOKIE_MICROSOFT	"conectix"
@@ -114,10 +116,12 @@ struct vhd_dyn_header {
 _Static_assert(sizeof(struct vhd_dyn_header) == 1024, "Wrong size for header");
 
 static int
-vhd_resize(lba_t imgsz __unused)
+vhd_resize(lba_t imgsz)
 {
 
-	return (0);
+	/* Round to a multiple of the block size. */
+	imgsz = (imgsz + VHD_BLOCK_SIZE - 1) & ~(VHD_BLOCK_SIZE - 1);
+	return (image_set_size(imgsz));
 }
 
 static int