git: 498276b487c8 - main - mkimg: Make vmdk's desc_fmt slightly more generic

The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=498276b487c838afa2b3e4df322c43141788ba20

commit 498276b487c838afa2b3e4df322c43141788ba20
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2026-09-26 16:32:15 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-10-03 15:42:19 +0000

    mkimg: Make vmdk's desc_fmt slightly more generic
    
    This will allow it to be reused in upcoming work.
    
    Suggested by:   Claude Opus 5.5
    MFC after:      2 weeks
    Sponsored by:   Amazon
    Differential Revision:  https://reviews.freebsd.org/D60150
---
 usr.bin/mkimg/vmdk.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/usr.bin/mkimg/vmdk.c b/usr.bin/mkimg/vmdk.c
index 339e8413b910..838cfa673ed6 100644
--- a/usr.bin/mkimg/vmdk.c
+++ b/usr.bin/mkimg/vmdk.c
@@ -75,7 +75,7 @@ static const char desc_fmt[] =
     "version=%d\n"
     "CID=%08x\n"
     "parentCID=ffffffff\n"
-    "createType=\"monolithicSparse\"\n"
+    "createType=\"%s\"\n"
     "# Extent description\n"
     "RW %ju SPARSE \"%s\"\n"
     "# The Disk Data Base\n"
@@ -83,7 +83,8 @@ static const char desc_fmt[] =
     "ddb.adapterType = \"ide\"\n"
     "ddb.geometry.cylinders = \"%u\"\n"
     "ddb.geometry.heads = \"%u\"\n"
-    "ddb.geometry.sectors = \"%u\"\n";
+    "ddb.geometry.sectors = \"%u\"\n"
+    "%s";
 
 static uint64_t grainsz;
 
@@ -127,8 +128,10 @@ vmdk_write(int fd)
 	le64enc(&hdr.grain_size, grainsz);
 
 	n = asprintf(&desc, desc_fmt, 1 /*version*/, 0 /*CID*/,
+	    "monolithicSparse" /*type*/,
 	    (uintmax_t)imagesz /*size*/, "" /*name*/,
-	    ncyls /*cylinders*/, nheads /*heads*/, nsecs /*sectors*/);
+	    ncyls /*cylinders*/, nheads /*heads*/, nsecs /*sectors*/,
+	    "" /*extra*/);
 	if (n == -1)
 		return (ENOMEM);