From nobody Sat Oct 03 15:42:42 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 4hxqfV388gz6vcPR for ; Sat, 03 Oct 2026 15:42:42 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hxqfV1TfNz4ScF for ; Sat, 03 Oct 2026 15:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791042162; 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=w5k68Akh7xn6f+vOOygvwJxu4z0X9cA94gQwySHp5C0=; b=nLQbZOvhp3Ys/phaMVZKh+k8Pf+B0gruX4MVuZw/m3C3ci3ptNmDIDvEU1gDHauPgA7Vgp mglbmeWZ7GjQSzvSKeLWgBIrOchZWnaH6FAukvA8j9z/5m886iw4NhFSAadk5pBxAKa21c yMKn+o23lIRmB1ZqffGaeEuMOqT1Qwts00VKWCPGBVofgoift7izNPxbyuX8tnFdXiJLjR Ft0LgMEKfFzJRe99ljR2wXeEpclZ7ztbrjd8yjfc7fP/oetcV69d5dN8krspsPNLYP6wQK QvumBbegEMDZAoe6SoTmkB5VdXJCBJczGWhUxsdQHM+HfAivlu+2eSrWTH719A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791042162; b=kc8Ibx3slQR9Z1GqfBJwOLtnLGuee75SkPgSPbRVhwMlGtT+POWvu1LJLi9nGCXN9VaTAk 83EWFOqtJoCChsyEzKf5fY9adAlEU9N0rQzjV1th5bcO5dOSyfFB7W9OatUy3KZx0iK41w 8AoW+DgjgXdsjQgGcZ8nLaGkQeN2Vks/dSoI85GnMfBBzTCmSjtbf9ZzOZZPlqkYUvNYQZ RjXYQ2t390Sunkjdnz0VeaZNGK0ylv+rA/E4KSk2tdEug54PV4fdOuynurkaVNxnKA9HXC Lvprv7hzLrO+aTWrwuNLsFHxnC8lJx6iaAnQc0CLeDhmGI2FPNpnf28ZLgSmkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791042162; 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=w5k68Akh7xn6f+vOOygvwJxu4z0X9cA94gQwySHp5C0=; b=NIqGrzLiFHJnjxTCaXocQwOhGJhyswbuwPGr+6tH7yuPa5xheDNf5nUbVaUhtgBC+5gDrB npNH92+GTs8QuAEUbRyS6kF7dUHTqlzFnvSG2ikkpFrMShpzGcbTT6ttPeXe1zSo+cpvN6 c0lI89oUId0yodnt/Z6fbjz2weWDxJkd3Uy6PYG+7uYnnpR/YeHJtlP0OCpzHtBAE//Wpv hJ8VxX3DfwfdlnP6s4CV5IE/sE9tV/pp2e9sBVse/nMM3ve2B/gA8U2WwCrNc/TLrZ0Bb7 Y9DMyezlmsjtw+8zMbOaWgfnOQOiXIBmxkqxOIYhwJPkAVKJl9pQWBuGMiqBJw== 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 4hxqfV0YCPz18Fl for ; Sat, 03 Oct 2026 15:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4095f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Oct 2026 15:42:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 498276b487c8 - main - mkimg: Make vmdk's desc_fmt slightly more generic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 498276b487c838afa2b3e4df322c43141788ba20 Auto-Submitted: auto-generated Date: Sat, 03 Oct 2026 15:42:42 +0000 Message-Id: <6ac12272.4095f.77642393@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=498276b487c838afa2b3e4df322c43141788ba20 commit 498276b487c838afa2b3e4df322c43141788ba20 Author: Colin Percival AuthorDate: 2026-09-26 16:32:15 +0000 Commit: Colin Percival 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);