From nobody Sat Oct 17 17:08:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4j6SvD2tFFz6wRr8 for ; Sat, 17 Oct 2026 17:08:40 +0000 (UTC) (envelope-from git@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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j6SvC4yFBz4VHg for ; Sat, 17 Oct 2026 17:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792256919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7i88ZTqcN/ARzZc9m90FPJR1XXrkMSy7JVNMEoGZb2o=; b=MeFYudPlfyOPN/o27zqNsSecMmN1noTSLDKyDUpjGd8OgKmuPDuzVvzYaHCaBEwveYInx7 KWMXQ+ltppP4snyKyScQ7IAX136S2R/cjMKuhG1+rQZoBFJzA2GXJqJyWjG6aSf1QXoM7E aj1TNCeYJXTSQ9boVmRsRcJJv02MDFzyeqozn2dC5r0i/BjB7E6uXRJZNSJwAVrrPn9ncJ Hl87akZVsHxOpzOu1kMbyY5sQ3r/P22HVW7gCH2ujK3xDrfezeSXng13aO4nCB6wE6x/7o ACYjMo47/04RtfXCvhq+U46uNXviPikeCRFBT+5oJq+k4++Qvw0+1CWVzydPBQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792256919; b=beex1DdNH5CXSOMd+7+XL6ntjYkSsrY5E8En6IEtYI2o3vGCgHtJYmRfrL7xdXuzUTYkj4 pens7nN0QP3MMSRxToMjPN9ctrMbSqBPrWZDvgODlXun7V+JcuyHts3dZhbcX9gENpxB7X WgUaeEgUViVEnvJgM0hmqtQXDpyzyut6fOKeAmJHIV5GTpxRq8dy7vkMOE+b3EGZwBpnk+ 61t0V7mCXunBySStiFr1Lu0H4jkzRLpzAbvojc6Snioah3xDcJAvxEihYrljiibnlFVbMN VRgXYOZhAGsVBB4rBxo1JCGA70mcR/DqjAwjlwhDVok6qtYkaHrqIQgL4wEoAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792256919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7i88ZTqcN/ARzZc9m90FPJR1XXrkMSy7JVNMEoGZb2o=; b=KaXpwVWTAkyqaq79XC/gY9ehAqLWGUZg3edc2rQZKtLfarfqtXI6f2OTXGKj8xbuJJfplp IlnoVku1rTrz95ammuX975KaAFPLetNR4nvHGXU5nCTnbID7YnexwZpVGVr4IQ5J9BIprh t4c34JZ214ck4S1o7u9RC63kmBiGXyl1pkl9QliSJwOt2b6YhZzDP2X4acI+S0jCwdm90r /eIiIPejl4ITSQBF1BA4zeEL58uXx1/y7QdCpOmlq8F92rVDA/7ToasgzuBPejqTeJ0Ium 58sYfA6Es/7McLDdNutm8hT5CljBy5H85i07xyxXsD9cCpgNbN85GC3KAFT1wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j6SvC3v7Rz1BcQ for ; Sat, 17 Oct 2026 17:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 196de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Oct 2026 17:08:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 646efd646bce - stable/15 - mkimg: Make vmdk's desc_fmt slightly more generic List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 646efd646bce9d1dcc8cb86355d7b1d54405be23 Auto-Submitted: auto-generated Date: Sat, 17 Oct 2026 17:08:39 +0000 Message-Id: <6ad3ab97.196de.3468c79e@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=646efd646bce9d1dcc8cb86355d7b1d54405be23 commit 646efd646bce9d1dcc8cb86355d7b1d54405be23 Author: Colin Percival AuthorDate: 2026-09-26 16:32:15 +0000 Commit: Colin Percival CommitDate: 2026-10-17 17:02:26 +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 (cherry picked from commit 498276b487c838afa2b3e4df322c43141788ba20) --- 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);