From owner-svn-src-stable@freebsd.org  Mon Jun 29 00:34:20 2020
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0823B359919;
 Mon, 29 Jun 2020 00:34:19 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49w7lt23gwz44qG;
 Mon, 29 Jun 2020 00:34:17 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B75881F01A;
 Mon, 29 Jun 2020 00:34:14 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05T0YEvJ051121;
 Mon, 29 Jun 2020 00:34:14 GMT (envelope-from gonzo@FreeBSD.org)
Received: (from gonzo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05T0YBU7051105;
 Mon, 29 Jun 2020 00:34:11 GMT (envelope-from gonzo@FreeBSD.org)
Message-Id: <202006290034.05T0YBU7051105@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gonzo set sender to
 gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Mon, 29 Jun 2020 00:34:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r362767 - in stable/12/usr.bin/mkimg: . tests
X-SVN-Group: stable-12
X-SVN-Commit-Author: gonzo
X-SVN-Commit-Paths: in stable/12/usr.bin/mkimg: . tests
X-SVN-Commit-Revision: 362767
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Jun 2020 00:34:20 -0000

Author: gonzo
Date: Mon Jun 29 00:34:11 2020
New Revision: 362767
URL: https://svnweb.freebsd.org/changeset/base/362767

Log:
  MFC r361935:
  
  Add VHDX support to mkimg(1)
  
  VHDX is the successor of Microsoft's VHD file format. It increases
  maximum capacity of the virtual drive to 64TB and introduces features
  to better handle power/system failures.
  
  VHDX is the required format for 2nd generation Hyper-V VMs.
  
  Reviewed by:	marcel
  Differential Revision:	https://reviews.freebsd.org/D25184

Added:
  stable/12/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-1x1-512-apm.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-63x255-512-apm.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-63x255-512-apm.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdx.hex
  stable/12/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdx.hex
     - copied unchanged from r361935, head/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdx.hex
  stable/12/usr.bin/mkimg/vhdx.c
     - copied unchanged from r361935, head/usr.bin/mkimg/vhdx.c
Modified:
  stable/12/usr.bin/mkimg/Makefile
  stable/12/usr.bin/mkimg/mkimg.1
  stable/12/usr.bin/mkimg/tests/mkimg_test.sh
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.bin/mkimg/Makefile
==============================================================================
--- stable/12/usr.bin/mkimg/Makefile	Mon Jun 29 00:32:24 2020	(r362766)
+++ stable/12/usr.bin/mkimg/Makefile	Mon Jun 29 00:34:11 2020	(r362767)
@@ -18,6 +18,7 @@ SRCS+= \
 	qcow.c \
 	raw.c \
 	vhd.c \
+	vhdx.c \
 	vmdk.c
 
 # List of schemes to support

Modified: stable/12/usr.bin/mkimg/mkimg.1
==============================================================================
--- stable/12/usr.bin/mkimg/mkimg.1	Mon Jun 29 00:32:24 2020	(r362766)
+++ stable/12/usr.bin/mkimg/mkimg.1	Mon Jun 29 00:34:11 2020	(r362767)
@@ -257,6 +257,16 @@ To create a fixed VHD file for use by Azure, specify
 .Fl f Ar vhdf
 on the command line.
 The preferred file extension is ".vhd".
+.Ss Dynamic VHDX
+Microsoft's "Virtual Hard Disk v2" file formats, the
+successor to VHD.
+VHDX is the required format for the 2nd generation Hyper-V VMs.
+To have
+.Nm
+create a dynamic VHDX file, specify
+.Fl f Ar vhdx
+on the command line.
+The preferred file extension is ".vhdx".
 .Ss VMDK
 VMware's "Virtual Machine Disk" file format.
 It's a sparse file format akin to QCOW and VHD and supported by many

Copied: stable/12/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdx.hex (from r361935, head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdx.hex)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdx.hex	Mon Jun 29 00:34:11 2020	(r362767, copy of r361935, head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdx.hex)
@@ -0,0 +1,79 @@
+# $FreeBSD$
+00000000  76 68 64 78 66 69 6c 65  00 00 00 00 00 00 00 00  |vhdxfile........|
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010000  68 65 61 64 64 db 05 73  00 00 00 00 00 00 00 00  |headd..s........|
+00010010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00010050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020000  68 65 61 64 13 47 fd f1  01 00 00 00 00 00 00 00  |head.G..........|
+00020010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00020050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00030000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00030010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00030020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00030030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00030040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00030050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00040000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00040010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00040020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00040030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00040040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00040050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00200000  6d 65 74 61 64 61 74 61  00 00 05 00 00 00 00 00  |metadata........|
+00200010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00200020  37 67 a1 ca 36 fa 43 4d  b3 b6 33 f0 aa 44 e7 6b  |7g..6.CM..3..D.k|
+00200030  00 00 01 00 08 00 00 00  04 00 00 00 00 00 00 00  |................|
+00200040  24 42 a5 2f 1b cd 76 48  b2 11 5d be d8 3b f4 b8  |$B./..vH..]..;..|
+00200050  08 00 01 00 08 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200060  ab 12 ca be e6 b2 23 45  93 ef c3 09 e0 00 c7 46  |......#E.......F|
+00200070  10 00 01 00 10 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200080  1d bf 41 81 6f a9 09 47  ba 47 f2 33 a8 fa ab 5f  |..A.o..G.G.3..._|
+00200090  20 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  | ...............|
+002000a0  c7 48 a3 cd 5d 44 71 44  9c c9 e9 88 52 51 c5 56  |.H..]DqD....RQ.V|
+002000b0  24 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  |$...............|
+002000c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00210000  00 00 00 01 00 00 00 00  00 00 00 01 00 00 00 00  |................|
+00210010  01 01 01 01 01 01 01 01  01 01 01 01 01 01 01 01  |................|
+00210020  00 02 00 00 00 10 00 00  00 00 00 00 00 00 00 00  |................|
+00210030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00300000  06 00 40 00 00 00 00 00  00 00 00 00 00 00 00 00  |..@.............|
+00300010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400000  45 52 02 00 00 00 80 00  00 00 00 00 00 00 00 00  |ER..............|
+00400010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400200  50 4d 00 00 00 00 00 03  00 00 00 01 00 00 00 03  |PM..............|
+00400210  41 70 70 6c 65 00 00 00  00 00 00 00 00 00 00 00  |Apple...........|
+00400220  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00400230  41 70 70 6c 65 5f 70 61  72 74 69 74 69 6f 6e 5f  |Apple_partition_|
+00400240  6d 61 70 00 00 00 00 00  00 00 00 00 00 00 00 00  |map.............|
+00400250  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400400  50 4d 00 00 00 00 00 03  00 00 00 08 00 00 20 00  |PM............ .|
+00400410  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400430  46 72 65 65 42 53 44 2d  55 46 53 00 00 00 00 00  |FreeBSD-UFS.....|
+00400440  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400600  50 4d 00 00 00 00 00 03  00 00 20 08 00 00 01 00  |PM........ .....|
+00400610  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400630  46 72 65 65 42 53 44 2d  73 77 61 70 00 00 00 00  |FreeBSD-swap....|
+00400640  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00401000  50 0a 50 0a 50 0a 50 0a  50 0a 50 0a 50 0a 50 0a  |P.P.P.P.P.P.P.P.|
+*
+00801000  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+01400000

Copied: stable/12/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdx.hex (from r361935, head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdx.hex)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdx.hex	Mon Jun 29 00:34:11 2020	(r362767, copy of r361935, head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdx.hex)
@@ -0,0 +1,75 @@
+# $FreeBSD$
+00000000  76 68 64 78 66 69 6c 65  00 00 00 00 00 00 00 00  |vhdxfile........|
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010000  68 65 61 64 64 db 05 73  00 00 00 00 00 00 00 00  |headd..s........|
+00010010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00010050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020000  68 65 61 64 13 47 fd f1  01 00 00 00 00 00 00 00  |head.G..........|
+00020010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00020050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00030000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00030010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00030020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00030030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00030040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00030050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00040000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00040010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00040020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00040030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00040040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00040050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00200000  6d 65 74 61 64 61 74 61  00 00 05 00 00 00 00 00  |metadata........|
+00200010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00200020  37 67 a1 ca 36 fa 43 4d  b3 b6 33 f0 aa 44 e7 6b  |7g..6.CM..3..D.k|
+00200030  00 00 01 00 08 00 00 00  04 00 00 00 00 00 00 00  |................|
+00200040  24 42 a5 2f 1b cd 76 48  b2 11 5d be d8 3b f4 b8  |$B./..vH..]..;..|
+00200050  08 00 01 00 08 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200060  ab 12 ca be e6 b2 23 45  93 ef c3 09 e0 00 c7 46  |......#E.......F|
+00200070  10 00 01 00 10 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200080  1d bf 41 81 6f a9 09 47  ba 47 f2 33 a8 fa ab 5f  |..A.o..G.G.3..._|
+00200090  20 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  | ...............|
+002000a0  c7 48 a3 cd 5d 44 71 44  9c c9 e9 88 52 51 c5 56  |.H..]DqD....RQ.V|
+002000b0  24 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  |$...............|
+002000c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00210000  00 00 00 01 00 00 00 00  00 00 00 01 00 00 00 00  |................|
+00210010  01 01 01 01 01 01 01 01  01 01 01 01 01 01 01 01  |................|
+00210020  00 02 00 00 00 10 00 00  00 00 00 00 00 00 00 00  |................|
+00210030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00300000  06 00 40 00 00 00 00 00  00 00 00 00 00 00 00 00  |..@.............|
+00300010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400000  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+00400200  57 45 56 82 00 00 00 00  00 00 00 00 00 00 00 00  |WEV.............|
+00400210  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00400220  00 00 00 00 00 00 00 00  00 02 00 00 01 00 00 00  |................|
+00400230  01 00 00 00 00 80 00 00  01 00 00 00 00 80 00 00  |................|
+00400240  00 00 00 00 00 00 00 00  10 0e 00 00 00 00 00 00  |................|
+00400250  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400280  00 00 00 00 57 45 56 82  1f ad 08 00 00 20 00 00  |....WEV...... ..|
+00400290  00 00 00 00 00 20 00 00  10 00 00 00 00 00 00 00  |..... ..........|
+004002a0  07 00 00 00 00 01 00 00  10 20 00 00 00 00 00 00  |......... ......|
+004002b0  01 00 00 00 00 80 00 00  00 00 00 00 00 00 00 00  |................|
+004002c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400310  00 00 00 00 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |....B.B.B.B.B.B.|
+00400320  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+00402000  50 0a 50 0a 50 0a 50 0a  50 0a 50 0a 50 0a 50 0a  |P.P.P.P.P.P.P.P.|
+*
+00802000  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+01400000

Copied: stable/12/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdx.hex (from r361935, head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdx.hex)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdx.hex	Mon Jun 29 00:34:11 2020	(r362767, copy of r361935, head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdx.hex)
@@ -0,0 +1,80 @@
+# $FreeBSD$
+00000000  76 68 64 78 66 69 6c 65  00 00 00 00 00 00 00 00  |vhdxfile........|
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010000  68 65 61 64 64 db 05 73  00 00 00 00 00 00 00 00  |headd..s........|
+00010010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00010050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020000  68 65 61 64 13 47 fd f1  01 00 00 00 00 00 00 00  |head.G..........|
+00020010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00020050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00030000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00030010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00030020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00030030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00030040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00030050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00040000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00040010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00040020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00040030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00040040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00040050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00200000  6d 65 74 61 64 61 74 61  00 00 05 00 00 00 00 00  |metadata........|
+00200010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00200020  37 67 a1 ca 36 fa 43 4d  b3 b6 33 f0 aa 44 e7 6b  |7g..6.CM..3..D.k|
+00200030  00 00 01 00 08 00 00 00  04 00 00 00 00 00 00 00  |................|
+00200040  24 42 a5 2f 1b cd 76 48  b2 11 5d be d8 3b f4 b8  |$B./..vH..]..;..|
+00200050  08 00 01 00 08 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200060  ab 12 ca be e6 b2 23 45  93 ef c3 09 e0 00 c7 46  |......#E.......F|
+00200070  10 00 01 00 10 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200080  1d bf 41 81 6f a9 09 47  ba 47 f2 33 a8 fa ab 5f  |..A.o..G.G.3..._|
+00200090  20 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  | ...............|
+002000a0  c7 48 a3 cd 5d 44 71 44  9c c9 e9 88 52 51 c5 56  |.H..]DqD....RQ.V|
+002000b0  24 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  |$...............|
+002000c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00210000  00 00 00 01 00 00 00 00  00 00 00 01 00 00 00 00  |................|
+00210010  01 01 01 01 01 01 01 01  01 01 01 01 01 01 01 01  |................|
+00210020  00 02 00 00 00 10 00 00  00 00 00 00 00 00 00 00  |................|
+00210030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00300000  06 00 40 00 00 00 00 00  00 00 00 00 00 00 00 00  |..@.............|
+00300010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+004001b0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 ff  |................|
+004001c0  ff ff a5 ff ff ff 01 00  00 00 10 21 00 00 00 00  |...........!....|
+004001d0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+004001f0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 55 aa  |..............U.|
+00400200  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+00400400  57 45 56 82 00 00 00 00  00 00 00 00 00 00 00 00  |WEV.............|
+00400410  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00400420  00 00 00 00 00 00 00 00  00 02 00 00 01 00 00 00  |................|
+00400430  01 00 00 00 10 21 00 00  01 00 00 00 10 21 00 00  |.....!.......!..|
+00400440  00 00 00 00 00 00 00 00  10 0e 00 00 00 00 00 00  |................|
+00400450  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400480  00 00 00 00 57 45 56 82  0f 0c 08 00 00 20 00 00  |....WEV...... ..|
+00400490  00 00 00 00 00 20 00 00  10 00 00 00 00 00 00 00  |..... ..........|
+004004a0  07 00 00 00 00 01 00 00  10 20 00 00 00 00 00 00  |......... ......|
+004004b0  01 00 00 00 10 21 00 00  00 00 00 00 00 00 00 00  |.....!..........|
+004004c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400510  00 00 00 00 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |....B.B.B.B.B.B.|
+00400520  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+00402200  50 0a 50 0a 50 0a 50 0a  50 0a 50 0a 50 0a 50 0a  |P.P.P.P.P.P.P.P.|
+*
+00802200  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+01400000

Copied: stable/12/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex (from r361935, head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex	Mon Jun 29 00:34:11 2020	(r362767, copy of r361935, head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex)
@@ -0,0 +1,100 @@
+# $FreeBSD$
+00000000  76 68 64 78 66 69 6c 65  00 00 00 00 00 00 00 00  |vhdxfile........|
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010000  68 65 61 64 64 db 05 73  00 00 00 00 00 00 00 00  |headd..s........|
+00010010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00010050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020000  68 65 61 64 13 47 fd f1  01 00 00 00 00 00 00 00  |head.G..........|
+00020010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00020050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00030000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00030010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00030020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00030030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00030040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00030050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00040000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00040010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00040020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00040030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00040040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00040050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00200000  6d 65 74 61 64 61 74 61  00 00 05 00 00 00 00 00  |metadata........|
+00200010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00200020  37 67 a1 ca 36 fa 43 4d  b3 b6 33 f0 aa 44 e7 6b  |7g..6.CM..3..D.k|
+00200030  00 00 01 00 08 00 00 00  04 00 00 00 00 00 00 00  |................|
+00200040  24 42 a5 2f 1b cd 76 48  b2 11 5d be d8 3b f4 b8  |$B./..vH..]..;..|
+00200050  08 00 01 00 08 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200060  ab 12 ca be e6 b2 23 45  93 ef c3 09 e0 00 c7 46  |......#E.......F|
+00200070  10 00 01 00 10 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200080  1d bf 41 81 6f a9 09 47  ba 47 f2 33 a8 fa ab 5f  |..A.o..G.G.3..._|
+00200090  20 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  | ...............|
+002000a0  c7 48 a3 cd 5d 44 71 44  9c c9 e9 88 52 51 c5 56  |.H..]DqD....RQ.V|
+002000b0  24 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  |$...............|
+002000c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00210000  00 00 00 01 00 00 00 00  00 00 00 01 00 00 00 00  |................|
+00210010  04 04 04 04 04 04 04 04  04 04 04 04 04 04 04 04  |................|
+00210020  00 02 00 00 00 10 00 00  00 00 00 00 00 00 00 00  |................|
+00210030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00300000  06 00 40 00 00 00 00 00  00 00 00 00 00 00 00 00  |..@.............|
+00300010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400000  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+004001b0  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 00 00  |B.B.B.B.B.B.B...|
+004001c0  02 00 ee ff ff ff 01 00  00 00 ff 7f 00 00 00 00  |................|
+004001d0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+004001f0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 55 aa  |..............U.|
+00400200  45 46 49 20 50 41 52 54  00 00 01 00 5c 00 00 00  |EFI PART....\...|
+00400210  74 bd 80 b6 00 00 00 00  01 00 00 00 00 00 00 00  |t...............|
+00400220  ff 7f 00 00 00 00 00 00  03 00 00 00 00 00 00 00  |................|
+00400230  fd 7f 00 00 00 00 00 00  03 03 03 03 03 03 03 03  |................|
+00400240  03 03 03 03 03 03 03 03  02 00 00 00 00 00 00 00  |................|
+00400250  04 00 00 00 80 00 00 00  b2 50 1a c4 00 00 00 00  |.........P......|
+00400260  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400400  b6 7c 6e 51 cf 6e d6 11  8f f8 00 02 2d 09 71 2b  |.|nQ.n......-.q+|
+00400410  01 01 01 01 01 01 01 01  01 01 01 01 01 01 01 01  |................|
+00400420  08 00 00 00 00 00 00 00  07 20 00 00 00 00 00 00  |......... ......|
+00400430  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400480  b5 7c 6e 51 cf 6e d6 11  8f f8 00 02 2d 09 71 2b  |.|nQ.n......-.q+|
+00400490  02 02 02 02 02 02 02 02  02 02 02 02 02 02 02 02  |................|
+004004a0  08 20 00 00 00 00 00 00  07 21 00 00 00 00 00 00  |. .......!......|
+004004b0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00401000  50 0a 50 0a 50 0a 50 0a  50 0a 50 0a 50 0a 50 0a  |P.P.P.P.P.P.P.P.|
+*
+00801000  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+013ffc00  b6 7c 6e 51 cf 6e d6 11  8f f8 00 02 2d 09 71 2b  |.|nQ.n......-.q+|
+013ffc10  01 01 01 01 01 01 01 01  01 01 01 01 01 01 01 01  |................|
+013ffc20  08 00 00 00 00 00 00 00  07 20 00 00 00 00 00 00  |......... ......|
+013ffc30  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+013ffc80  b5 7c 6e 51 cf 6e d6 11  8f f8 00 02 2d 09 71 2b  |.|nQ.n......-.q+|
+013ffc90  02 02 02 02 02 02 02 02  02 02 02 02 02 02 02 02  |................|
+013ffca0  08 20 00 00 00 00 00 00  07 21 00 00 00 00 00 00  |. .......!......|
+013ffcb0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+013ffe00  45 46 49 20 50 41 52 54  00 00 01 00 5c 00 00 00  |EFI PART....\...|
+013ffe10  87 87 ed 30 00 00 00 00  ff 7f 00 00 00 00 00 00  |...0............|
+013ffe20  01 00 00 00 00 00 00 00  03 00 00 00 00 00 00 00  |................|
+013ffe30  fd 7f 00 00 00 00 00 00  03 03 03 03 03 03 03 03  |................|
+013ffe40  03 03 03 03 03 03 03 03  fe 7f 00 00 00 00 00 00  |................|
+013ffe50  04 00 00 00 80 00 00 00  b2 50 1a c4 00 00 00 00  |.........P......|
+013ffe60  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+01400000

Copied: stable/12/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdx.hex (from r361935, head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdx.hex)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdx.hex	Mon Jun 29 00:34:11 2020	(r362767, copy of r361935, head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdx.hex)
@@ -0,0 +1,82 @@
+# $FreeBSD$
+00000000  76 68 64 78 66 69 6c 65  00 00 00 00 00 00 00 00  |vhdxfile........|
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010000  68 65 61 64 64 db 05 73  00 00 00 00 00 00 00 00  |headd..s........|
+00010010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00010050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020000  68 65 61 64 13 47 fd f1  01 00 00 00 00 00 00 00  |head.G..........|
+00020010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00020050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00030000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00030010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00030020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00030030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00030040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00030050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00040000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00040010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00040020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00040030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00040040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00040050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00200000  6d 65 74 61 64 61 74 61  00 00 05 00 00 00 00 00  |metadata........|
+00200010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00200020  37 67 a1 ca 36 fa 43 4d  b3 b6 33 f0 aa 44 e7 6b  |7g..6.CM..3..D.k|
+00200030  00 00 01 00 08 00 00 00  04 00 00 00 00 00 00 00  |................|
+00200040  24 42 a5 2f 1b cd 76 48  b2 11 5d be d8 3b f4 b8  |$B./..vH..]..;..|
+00200050  08 00 01 00 08 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200060  ab 12 ca be e6 b2 23 45  93 ef c3 09 e0 00 c7 46  |......#E.......F|
+00200070  10 00 01 00 10 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200080  1d bf 41 81 6f a9 09 47  ba 47 f2 33 a8 fa ab 5f  |..A.o..G.G.3..._|
+00200090  20 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  | ...............|
+002000a0  c7 48 a3 cd 5d 44 71 44  9c c9 e9 88 52 51 c5 56  |.H..]DqD....RQ.V|
+002000b0  24 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  |$...............|
+002000c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00210000  00 00 00 01 00 00 00 00  00 00 00 01 00 00 00 00  |................|
+00210010  01 01 01 01 01 01 01 01  01 01 01 01 01 01 01 01  |................|
+00210020  00 02 00 00 00 10 00 00  00 00 00 00 00 00 00 00  |................|
+00210030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00300000  06 00 40 00 00 00 00 00  00 00 00 00 00 00 00 00  |..@.............|
+00300010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400000  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+004001b0  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 80 ff  |B.B.B.B.B.B.B...|
+004001c0  ff ff a5 ff ff ff 01 00  00 00 10 21 00 00 00 00  |...........!....|
+004001d0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+004001f0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 55 aa  |..............U.|
+00400200  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+00400400  57 45 56 82 00 00 00 00  00 00 00 00 00 00 00 00  |WEV.............|
+00400410  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00400420  00 00 00 00 00 00 00 00  00 02 00 00 01 00 00 00  |................|
+00400430  01 00 00 00 10 21 00 00  01 00 00 00 10 21 00 00  |.....!.......!..|
+00400440  00 00 00 00 00 00 00 00  10 0e 00 00 00 00 00 00  |................|
+00400450  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400480  00 00 00 00 57 45 56 82  0f 0c 08 00 00 20 00 00  |....WEV...... ..|
+00400490  00 00 00 00 00 20 00 00  10 00 00 00 00 00 00 00  |..... ..........|
+004004a0  07 00 00 00 00 01 00 00  10 20 00 00 00 00 00 00  |......... ......|
+004004b0  01 00 00 00 10 21 00 00  00 00 00 00 00 00 00 00  |.....!..........|
+004004c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400510  00 00 00 00 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |....B.B.B.B.B.B.|
+00400520  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+00402200  50 0a 50 0a 50 0a 50 0a  50 0a 50 0a 50 0a 50 0a  |P.P.P.P.P.P.P.P.|
+*
+00802200  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+01400000

Copied: stable/12/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex (from r361935, head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex	Mon Jun 29 00:34:11 2020	(r362767, copy of r361935, head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex)
@@ -0,0 +1,72 @@
+# $FreeBSD$
+00000000  76 68 64 78 66 69 6c 65  00 00 00 00 00 00 00 00  |vhdxfile........|
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010000  68 65 61 64 64 db 05 73  00 00 00 00 00 00 00 00  |headd..s........|
+00010010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00010050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020000  68 65 61 64 13 47 fd f1  01 00 00 00 00 00 00 00  |head.G..........|
+00020010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00020050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00030000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00030010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00030020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00030030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00030040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00030050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00040000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00040010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00040020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00040030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00040040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00040050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00200000  6d 65 74 61 64 61 74 61  00 00 05 00 00 00 00 00  |metadata........|
+00200010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00200020  37 67 a1 ca 36 fa 43 4d  b3 b6 33 f0 aa 44 e7 6b  |7g..6.CM..3..D.k|
+00200030  00 00 01 00 08 00 00 00  04 00 00 00 00 00 00 00  |................|
+00200040  24 42 a5 2f 1b cd 76 48  b2 11 5d be d8 3b f4 b8  |$B./..vH..]..;..|
+00200050  08 00 01 00 08 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200060  ab 12 ca be e6 b2 23 45  93 ef c3 09 e0 00 c7 46  |......#E.......F|
+00200070  10 00 01 00 10 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200080  1d bf 41 81 6f a9 09 47  ba 47 f2 33 a8 fa ab 5f  |..A.o..G.G.3..._|
+00200090  20 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  | ...............|
+002000a0  c7 48 a3 cd 5d 44 71 44  9c c9 e9 88 52 51 c5 56  |.H..]DqD....RQ.V|
+002000b0  24 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  |$...............|
+002000c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00210000  00 00 00 01 00 00 00 00  00 00 00 01 00 00 00 00  |................|
+00210010  01 01 01 01 01 01 01 01  01 01 01 01 01 01 01 01  |................|
+00210020  00 02 00 00 00 10 00 00  00 00 00 00 00 00 00 00  |................|
+00210030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00300000  06 00 40 00 00 00 00 00  00 00 00 00 00 00 00 00  |..@.............|
+00300010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400000  46 72 65 65 42 53 44 31  36 4d 00 00 00 00 00 00  |FreeBSD16M......|
+00400010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400080  00 00 00 01 00 00 00 00  00 00 00 00 00 08 09 02  |................|
+00400090  00 00 09 01 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+004000a0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+004000b0  00 00 00 00 00 00 00 00  00 00 00 00 60 0d de ee  |............`...|
+004000c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+004001a0  00 00 00 00 0e 10 80 00  00 00 00 00 00 00 00 00  |................|
+004001b0  80 00 00 00 00 01 00 01  00 00 00 00 00 00 00 01  |................|
+004001c0  00 00 20 00 00 00 20 01  00 00 01 00 00 00 00 00  |.. ... .........|
+004001d0  00 00 80 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+004001e0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+004001f0  00 00 00 00 00 00 00 00  00 00 00 00 da be f8 7f  |................|
+00400200  50 0a 50 0a 50 0a 50 0a  50 0a 50 0a 50 0a 50 0a  |P.P.P.P.P.P.P.P.|
+*
+00800200  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+01400000

Copied: stable/12/usr.bin/mkimg/tests/img-1x1-512-apm.vhdx.hex (from r361935, head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdx.hex)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/usr.bin/mkimg/tests/img-1x1-512-apm.vhdx.hex	Mon Jun 29 00:34:11 2020	(r362767, copy of r361935, head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdx.hex)
@@ -0,0 +1,79 @@
+# $FreeBSD$
+00000000  76 68 64 78 66 69 6c 65  00 00 00 00 00 00 00 00  |vhdxfile........|
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010000  68 65 61 64 64 db 05 73  00 00 00 00 00 00 00 00  |headd..s........|
+00010010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00010050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020000  68 65 61 64 13 47 fd f1  01 00 00 00 00 00 00 00  |head.G..........|
+00020010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00020050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00030000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00030010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00030020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00030030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00030040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00030050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00040000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00040010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00040020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00040030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00040040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00040050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00200000  6d 65 74 61 64 61 74 61  00 00 05 00 00 00 00 00  |metadata........|
+00200010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00200020  37 67 a1 ca 36 fa 43 4d  b3 b6 33 f0 aa 44 e7 6b  |7g..6.CM..3..D.k|
+00200030  00 00 01 00 08 00 00 00  04 00 00 00 00 00 00 00  |................|
+00200040  24 42 a5 2f 1b cd 76 48  b2 11 5d be d8 3b f4 b8  |$B./..vH..]..;..|
+00200050  08 00 01 00 08 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200060  ab 12 ca be e6 b2 23 45  93 ef c3 09 e0 00 c7 46  |......#E.......F|
+00200070  10 00 01 00 10 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200080  1d bf 41 81 6f a9 09 47  ba 47 f2 33 a8 fa ab 5f  |..A.o..G.G.3..._|
+00200090  20 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  | ...............|
+002000a0  c7 48 a3 cd 5d 44 71 44  9c c9 e9 88 52 51 c5 56  |.H..]DqD....RQ.V|
+002000b0  24 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  |$...............|
+002000c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00210000  00 00 00 01 00 00 00 00  00 00 00 01 00 00 00 00  |................|
+00210010  01 01 01 01 01 01 01 01  01 01 01 01 01 01 01 01  |................|
+00210020  00 02 00 00 00 02 00 00  00 00 00 00 00 00 00 00  |................|
+00210030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00300000  06 00 40 00 00 00 00 00  00 00 00 00 00 00 00 00  |..@.............|
+00300010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400000  45 52 02 00 00 00 80 00  00 00 00 00 00 00 00 00  |ER..............|
+00400010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400200  50 4d 00 00 00 00 00 03  00 00 00 01 00 00 00 03  |PM..............|
+00400210  41 70 70 6c 65 00 00 00  00 00 00 00 00 00 00 00  |Apple...........|
+00400220  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00400230  41 70 70 6c 65 5f 70 61  72 74 69 74 69 6f 6e 5f  |Apple_partition_|
+00400240  6d 61 70 00 00 00 00 00  00 00 00 00 00 00 00 00  |map.............|
+00400250  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400400  50 4d 00 00 00 00 00 03  00 00 00 04 00 00 20 00  |PM............ .|
+00400410  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400430  46 72 65 65 42 53 44 2d  55 46 53 00 00 00 00 00  |FreeBSD-UFS.....|
+00400440  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400600  50 4d 00 00 00 00 00 03  00 00 20 04 00 00 01 00  |PM........ .....|
+00400610  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400630  46 72 65 65 42 53 44 2d  73 77 61 70 00 00 00 00  |FreeBSD-swap....|
+00400640  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400800  50 0a 50 0a 50 0a 50 0a  50 0a 50 0a 50 0a 50 0a  |P.P.P.P.P.P.P.P.|
+*
+00800800  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+01400000

Copied: stable/12/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdx.hex (from r361935, head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdx.hex)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdx.hex	Mon Jun 29 00:34:11 2020	(r362767, copy of r361935, head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdx.hex)
@@ -0,0 +1,75 @@
+# $FreeBSD$
+00000000  76 68 64 78 66 69 6c 65  00 00 00 00 00 00 00 00  |vhdxfile........|
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010000  68 65 61 64 64 db 05 73  00 00 00 00 00 00 00 00  |headd..s........|
+00010010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00010050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020000  68 65 61 64 13 47 fd f1  01 00 00 00 00 00 00 00  |head.G..........|
+00020010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00020050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00030000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00030010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00030020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00030030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00030040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00030050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00040000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00040010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00040020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00040030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00040040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00040050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00200000  6d 65 74 61 64 61 74 61  00 00 05 00 00 00 00 00  |metadata........|
+00200010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00200020  37 67 a1 ca 36 fa 43 4d  b3 b6 33 f0 aa 44 e7 6b  |7g..6.CM..3..D.k|
+00200030  00 00 01 00 08 00 00 00  04 00 00 00 00 00 00 00  |................|
+00200040  24 42 a5 2f 1b cd 76 48  b2 11 5d be d8 3b f4 b8  |$B./..vH..]..;..|
+00200050  08 00 01 00 08 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200060  ab 12 ca be e6 b2 23 45  93 ef c3 09 e0 00 c7 46  |......#E.......F|
+00200070  10 00 01 00 10 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200080  1d bf 41 81 6f a9 09 47  ba 47 f2 33 a8 fa ab 5f  |..A.o..G.G.3..._|
+00200090  20 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  | ...............|
+002000a0  c7 48 a3 cd 5d 44 71 44  9c c9 e9 88 52 51 c5 56  |.H..]DqD....RQ.V|
+002000b0  24 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  |$...............|
+002000c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00210000  00 00 00 01 00 00 00 00  00 00 00 01 00 00 00 00  |................|
+00210010  01 01 01 01 01 01 01 01  01 01 01 01 01 01 01 01  |................|
+00210020  00 02 00 00 00 02 00 00  00 00 00 00 00 00 00 00  |................|
+00210030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00300000  06 00 40 00 00 00 00 00  00 00 00 00 00 00 00 00  |..@.............|
+00300010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400000  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+00400200  57 45 56 82 00 00 00 00  00 00 00 00 00 00 00 00  |WEV.............|
+00400210  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00400220  00 00 00 00 00 00 00 00  00 02 00 00 01 00 00 00  |................|
+00400230  01 00 00 00 00 80 00 00  01 00 00 00 00 80 00 00  |................|
+00400240  00 00 00 00 00 00 00 00  10 0e 00 00 00 00 00 00  |................|
+00400250  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400280  00 00 00 00 57 45 56 82  1f ad 08 00 00 20 00 00  |....WEV...... ..|
+00400290  00 00 00 00 00 20 00 00  10 00 00 00 00 00 00 00  |..... ..........|
+004002a0  07 00 00 00 00 01 00 00  10 20 00 00 00 00 00 00  |......... ......|
+004002b0  01 00 00 00 00 80 00 00  00 00 00 00 00 00 00 00  |................|
+004002c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400310  00 00 00 00 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |....B.B.B.B.B.B.|
+00400320  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+00402000  50 0a 50 0a 50 0a 50 0a  50 0a 50 0a 50 0a 50 0a  |P.P.P.P.P.P.P.P.|
+*
+00802000  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+01400000

Copied: stable/12/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdx.hex (from r361935, head/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdx.hex)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdx.hex	Mon Jun 29 00:34:11 2020	(r362767, copy of r361935, head/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdx.hex)
@@ -0,0 +1,80 @@
+# $FreeBSD$
+00000000  76 68 64 78 66 69 6c 65  00 00 00 00 00 00 00 00  |vhdxfile........|
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010000  68 65 61 64 64 db 05 73  00 00 00 00 00 00 00 00  |headd..s........|
+00010010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00010050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020000  68 65 61 64 13 47 fd f1  01 00 00 00 00 00 00 00  |head.G..........|
+00020010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00020050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00030000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00030010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00030020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00030030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00030040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00030050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00040000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00040010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00040020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00040030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00040040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00040050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00200000  6d 65 74 61 64 61 74 61  00 00 05 00 00 00 00 00  |metadata........|
+00200010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00200020  37 67 a1 ca 36 fa 43 4d  b3 b6 33 f0 aa 44 e7 6b  |7g..6.CM..3..D.k|
+00200030  00 00 01 00 08 00 00 00  04 00 00 00 00 00 00 00  |................|
+00200040  24 42 a5 2f 1b cd 76 48  b2 11 5d be d8 3b f4 b8  |$B./..vH..]..;..|
+00200050  08 00 01 00 08 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200060  ab 12 ca be e6 b2 23 45  93 ef c3 09 e0 00 c7 46  |......#E.......F|
+00200070  10 00 01 00 10 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200080  1d bf 41 81 6f a9 09 47  ba 47 f2 33 a8 fa ab 5f  |..A.o..G.G.3..._|
+00200090  20 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  | ...............|
+002000a0  c7 48 a3 cd 5d 44 71 44  9c c9 e9 88 52 51 c5 56  |.H..]DqD....RQ.V|
+002000b0  24 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  |$...............|
+002000c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00210000  00 00 00 01 00 00 00 00  00 00 00 01 00 00 00 00  |................|
+00210010  01 01 01 01 01 01 01 01  01 01 01 01 01 01 01 01  |................|
+00210020  00 02 00 00 00 02 00 00  00 00 00 00 00 00 00 00  |................|
+00210030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00300000  06 00 40 00 00 00 00 00  00 00 00 00 00 00 00 00  |..@.............|
+00300010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+004001b0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 ff  |................|
+004001c0  ff ff a5 ff ff ff 01 00  00 00 10 21 00 00 00 00  |...........!....|
+004001d0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+004001f0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 55 aa  |..............U.|
+00400200  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+00400400  57 45 56 82 00 00 00 00  00 00 00 00 00 00 00 00  |WEV.............|
+00400410  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00400420  00 00 00 00 00 00 00 00  00 02 00 00 01 00 00 00  |................|
+00400430  01 00 00 00 10 21 00 00  01 00 00 00 10 21 00 00  |.....!.......!..|
+00400440  00 00 00 00 00 00 00 00  10 0e 00 00 00 00 00 00  |................|
+00400450  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400480  00 00 00 00 57 45 56 82  0f 0c 08 00 00 20 00 00  |....WEV...... ..|
+00400490  00 00 00 00 00 20 00 00  10 00 00 00 00 00 00 00  |..... ..........|
+004004a0  07 00 00 00 00 01 00 00  10 20 00 00 00 00 00 00  |......... ......|
+004004b0  01 00 00 00 10 21 00 00  00 00 00 00 00 00 00 00  |.....!..........|
+004004c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400510  00 00 00 00 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |....B.B.B.B.B.B.|
+00400520  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+00402200  50 0a 50 0a 50 0a 50 0a  50 0a 50 0a 50 0a 50 0a  |P.P.P.P.P.P.P.P.|
+*
+00802200  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+01400000

Copied: stable/12/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex (from r361935, head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex	Mon Jun 29 00:34:11 2020	(r362767, copy of r361935, head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex)
@@ -0,0 +1,100 @@
+# $FreeBSD$
+00000000  76 68 64 78 66 69 6c 65  00 00 00 00 00 00 00 00  |vhdxfile........|
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010000  68 65 61 64 64 db 05 73  00 00 00 00 00 00 00 00  |headd..s........|
+00010010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00010050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020000  68 65 61 64 13 47 fd f1  01 00 00 00 00 00 00 00  |head.G..........|
+00020010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00020050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00030000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00030010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00030020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00030030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00030040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00030050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00040000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00040010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00040020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00040030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00040040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00040050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00200000  6d 65 74 61 64 61 74 61  00 00 05 00 00 00 00 00  |metadata........|
+00200010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00200020  37 67 a1 ca 36 fa 43 4d  b3 b6 33 f0 aa 44 e7 6b  |7g..6.CM..3..D.k|
+00200030  00 00 01 00 08 00 00 00  04 00 00 00 00 00 00 00  |................|
+00200040  24 42 a5 2f 1b cd 76 48  b2 11 5d be d8 3b f4 b8  |$B./..vH..]..;..|
+00200050  08 00 01 00 08 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200060  ab 12 ca be e6 b2 23 45  93 ef c3 09 e0 00 c7 46  |......#E.......F|
+00200070  10 00 01 00 10 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200080  1d bf 41 81 6f a9 09 47  ba 47 f2 33 a8 fa ab 5f  |..A.o..G.G.3..._|
+00200090  20 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  | ...............|
+002000a0  c7 48 a3 cd 5d 44 71 44  9c c9 e9 88 52 51 c5 56  |.H..]DqD....RQ.V|
+002000b0  24 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  |$...............|
+002000c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00210000  00 00 00 01 00 00 00 00  00 00 00 01 00 00 00 00  |................|
+00210010  04 04 04 04 04 04 04 04  04 04 04 04 04 04 04 04  |................|
+00210020  00 02 00 00 00 02 00 00  00 00 00 00 00 00 00 00  |................|
+00210030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00300000  06 00 40 00 00 00 00 00  00 00 00 00 00 00 00 00  |..@.............|
+00300010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400000  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+004001b0  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 00 00  |B.B.B.B.B.B.B...|
+004001c0  02 00 ee ff ff ff 01 00  00 00 ff 7f 00 00 00 00  |................|
+004001d0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+004001f0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 55 aa  |..............U.|
+00400200  45 46 49 20 50 41 52 54  00 00 01 00 5c 00 00 00  |EFI PART....\...|
+00400210  71 3e 06 15 00 00 00 00  01 00 00 00 00 00 00 00  |q>..............|
+00400220  ff 7f 00 00 00 00 00 00  03 00 00 00 00 00 00 00  |................|
+00400230  fd 7f 00 00 00 00 00 00  03 03 03 03 03 03 03 03  |................|
+00400240  03 03 03 03 03 03 03 03  02 00 00 00 00 00 00 00  |................|
+00400250  04 00 00 00 80 00 00 00  45 45 ea fb 00 00 00 00  |........EE......|
+00400260  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400400  b6 7c 6e 51 cf 6e d6 11  8f f8 00 02 2d 09 71 2b  |.|nQ.n......-.q+|
+00400410  01 01 01 01 01 01 01 01  01 01 01 01 01 01 01 01  |................|
+00400420  03 00 00 00 00 00 00 00  02 20 00 00 00 00 00 00  |......... ......|
+00400430  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400480  b5 7c 6e 51 cf 6e d6 11  8f f8 00 02 2d 09 71 2b  |.|nQ.n......-.q+|
+00400490  02 02 02 02 02 02 02 02  02 02 02 02 02 02 02 02  |................|
+004004a0  03 20 00 00 00 00 00 00  02 21 00 00 00 00 00 00  |. .......!......|
+004004b0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400600  50 0a 50 0a 50 0a 50 0a  50 0a 50 0a 50 0a 50 0a  |P.P.P.P.P.P.P.P.|
+*
+00800600  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+013ffc00  b6 7c 6e 51 cf 6e d6 11  8f f8 00 02 2d 09 71 2b  |.|nQ.n......-.q+|
+013ffc10  01 01 01 01 01 01 01 01  01 01 01 01 01 01 01 01  |................|
+013ffc20  03 00 00 00 00 00 00 00  02 20 00 00 00 00 00 00  |......... ......|
+013ffc30  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+013ffc80  b5 7c 6e 51 cf 6e d6 11  8f f8 00 02 2d 09 71 2b  |.|nQ.n......-.q+|
+013ffc90  02 02 02 02 02 02 02 02  02 02 02 02 02 02 02 02  |................|
+013ffca0  03 20 00 00 00 00 00 00  02 21 00 00 00 00 00 00  |. .......!......|
+013ffcb0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+013ffe00  45 46 49 20 50 41 52 54  00 00 01 00 5c 00 00 00  |EFI PART....\...|
+013ffe10  82 04 6b 93 00 00 00 00  ff 7f 00 00 00 00 00 00  |..k.............|
+013ffe20  01 00 00 00 00 00 00 00  03 00 00 00 00 00 00 00  |................|
+013ffe30  fd 7f 00 00 00 00 00 00  03 03 03 03 03 03 03 03  |................|
+013ffe40  03 03 03 03 03 03 03 03  fe 7f 00 00 00 00 00 00  |................|
+013ffe50  04 00 00 00 80 00 00 00  45 45 ea fb 00 00 00 00  |........EE......|
+013ffe60  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+01400000

Copied: stable/12/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdx.hex (from r361935, head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdx.hex)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdx.hex	Mon Jun 29 00:34:11 2020	(r362767, copy of r361935, head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdx.hex)
@@ -0,0 +1,82 @@
+# $FreeBSD$
+00000000  76 68 64 78 66 69 6c 65  00 00 00 00 00 00 00 00  |vhdxfile........|
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010000  68 65 61 64 64 db 05 73  00 00 00 00 00 00 00 00  |headd..s........|
+00010010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00010050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020000  68 65 61 64 13 47 fd f1  01 00 00 00 00 00 00 00  |head.G..........|
+00020010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00020050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00030000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00030010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00030020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00030030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00030040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00030050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00040000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00040010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00040020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00040030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00040040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00040050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00200000  6d 65 74 61 64 61 74 61  00 00 05 00 00 00 00 00  |metadata........|
+00200010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00200020  37 67 a1 ca 36 fa 43 4d  b3 b6 33 f0 aa 44 e7 6b  |7g..6.CM..3..D.k|
+00200030  00 00 01 00 08 00 00 00  04 00 00 00 00 00 00 00  |................|
+00200040  24 42 a5 2f 1b cd 76 48  b2 11 5d be d8 3b f4 b8  |$B./..vH..]..;..|
+00200050  08 00 01 00 08 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200060  ab 12 ca be e6 b2 23 45  93 ef c3 09 e0 00 c7 46  |......#E.......F|
+00200070  10 00 01 00 10 00 00 00  06 00 00 00 00 00 00 00  |................|
+00200080  1d bf 41 81 6f a9 09 47  ba 47 f2 33 a8 fa ab 5f  |..A.o..G.G.3..._|
+00200090  20 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  | ...............|
+002000a0  c7 48 a3 cd 5d 44 71 44  9c c9 e9 88 52 51 c5 56  |.H..]DqD....RQ.V|
+002000b0  24 00 01 00 04 00 00 00  06 00 00 00 00 00 00 00  |$...............|
+002000c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00210000  00 00 00 01 00 00 00 00  00 00 00 01 00 00 00 00  |................|
+00210010  01 01 01 01 01 01 01 01  01 01 01 01 01 01 01 01  |................|
+00210020  00 02 00 00 00 02 00 00  00 00 00 00 00 00 00 00  |................|
+00210030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00300000  06 00 40 00 00 00 00 00  00 00 00 00 00 00 00 00  |..@.............|
+00300010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400000  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+004001b0  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 80 ff  |B.B.B.B.B.B.B...|
+004001c0  ff ff a5 ff ff ff 01 00  00 00 10 21 00 00 00 00  |...........!....|
+004001d0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+004001f0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 55 aa  |..............U.|
+00400200  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+00400400  57 45 56 82 00 00 00 00  00 00 00 00 00 00 00 00  |WEV.............|
+00400410  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00400420  00 00 00 00 00 00 00 00  00 02 00 00 01 00 00 00  |................|
+00400430  01 00 00 00 10 21 00 00  01 00 00 00 10 21 00 00  |.....!.......!..|
+00400440  00 00 00 00 00 00 00 00  10 0e 00 00 00 00 00 00  |................|
+00400450  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400480  00 00 00 00 57 45 56 82  0f 0c 08 00 00 20 00 00  |....WEV...... ..|
+00400490  00 00 00 00 00 20 00 00  10 00 00 00 00 00 00 00  |..... ..........|
+004004a0  07 00 00 00 00 01 00 00  10 20 00 00 00 00 00 00  |......... ......|
+004004b0  01 00 00 00 10 21 00 00  00 00 00 00 00 00 00 00  |.....!..........|
+004004c0  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00400510  00 00 00 00 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |....B.B.B.B.B.B.|
+00400520  42 0a 42 0a 42 0a 42 0a  42 0a 42 0a 42 0a 42 0a  |B.B.B.B.B.B.B.B.|
+*
+00402200  50 0a 50 0a 50 0a 50 0a  50 0a 50 0a 50 0a 50 0a  |P.P.P.P.P.P.P.P.|
+*
+00802200  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+01400000

Copied: stable/12/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdx.hex (from r361935, head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdx.hex)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdx.hex	Mon Jun 29 00:34:11 2020	(r362767, copy of r361935, head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdx.hex)
@@ -0,0 +1,72 @@
+# $FreeBSD$
+00000000  76 68 64 78 66 69 6c 65  00 00 00 00 00 00 00 00  |vhdxfile........|
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010000  68 65 61 64 64 db 05 73  00 00 00 00 00 00 00 00  |headd..s........|
+00010010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00010040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00010050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020000  68 65 61 64 13 47 fd f1  01 00 00 00 00 00 00 00  |head.G..........|
+00020010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00020040  00 00 01 00 00 00 10 00  00 00 10 00 00 00 00 00  |................|
+00020050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00030000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00030010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00030020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00030030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00030040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00030050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00040000  72 65 67 69 4c d5 3e 14  02 00 00 00 00 00 00 00  |regiL.>.........|
+00040010  06 a2 7c 8b 90 47 9a 4b  b8 fe 57 5f 05 0f 88 6e  |..|..G.K..W_...n|
+00040020  00 00 20 00 00 00 00 00  00 00 10 00 00 00 00 00  |.. .............|
+00040030  66 77 c2 2d 23 f6 00 42  9d 64 11 5e 9b fd 4a 08  |fw.-#..B.d.^..J.|
+00040040  00 00 30 00 00 00 00 00  00 00 10 00 00 00 00 00  |..0.............|
+00040050  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+*
+00200000  6d 65 74 61 64 61 74 61  00 00 05 00 00 00 00 00  |metadata........|

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***