From nobody Fri Dec 26 10:48:55 2025 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 4dd2RD19lWz6LNv8 for ; Fri, 26 Dec 2025 10:48:56 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd2RC69VXz3W6p for ; Fri, 26 Dec 2025 10:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766746135; 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=sbslg5yy+IlxtFfi9ngL+38KeLUfXtivOL8B9S4wFk4=; b=mOTdlh81dEEzOa7FcTTWZwa8reobjjzsSMILQvussRpxSVdYu6/VqkGz8HlGSai3tyn++J LRk+Q7+5Bk0qByZVuHJWf/bN7HIoAMPTvi8nP3EwAbU8vMPKRjmihPTA6KDHroOrH75+2h IAOmtLMrDPbNBx5NA+7rOv8HANGkObEYXFZ+LKY+HB9SEl9EC4I52fjSe1b5m5yFYCf7+l CvCHfNOcwUyBwl8Ks87r1ty8v46BJfM01w+HGfk9iqsvBRJPG4IMqkiNorukPWtQxCucKS C6C7vKv1dx+gDAXptsssFljlfO1csmUbv33xg4rH9em5Tor7EMFjhRkb24gBqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766746135; 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=sbslg5yy+IlxtFfi9ngL+38KeLUfXtivOL8B9S4wFk4=; b=NBZ/2p2FlOFIRMuUqIOV3ByALr3MzfjCbV7O6zsGxPd8XfcbdzOektHHFtAom0Mhqw0B3j DJUlsry/JYx7s8gsNkAfpxwQaM4pEffIo6aeWGrv0JlTOAPr6XkZ/KJWkP0gy5nPcU9vcp SdPmi+azhuoBxadsYvUwqU0lWgHBOpWuQUcQLhbvNco2h+j6mzTh2cAukG91P1EaxT8TnE ZIlgCmRRBzy6QG1vBl2kcoBkq0ZxrOnd7lvbkTUxsOwvSorgbkWqxHw9yIsUMAswKNS833 j2sTf4K4afKMX4hNR5RUcb5YMWCWFXkxZr3LFirXWnxMtI4X38jD6H/Va9MQag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766746135; a=rsa-sha256; cv=none; b=tIBpvxGErrsQKCN5/cHRzFjr3Bcz9t0O02rkWv3Bt5Kqmz+2kWjN4MKikRB8DQdwvckRFX vCd+jMeousqPkqU+pFnwWTATlX//yWKQy2ANjLVap7nHxMbs/ABBZAMKfg/6bCAK9lf5KY uf51Oy8ZluWBdMAEAsUNj52SFCMFYBvWyA7VKNxMOIeIH/gvEWQr7Ih6eOcoyP+ffcGTvz wS94OV4pX1xHH67A4deMjQx0bLZsh4081uIruvkeuvBaQAFyodCixYWAA5IqIoWan1HqG7 Eg1uySs27trdjQiwPEKO3EOtzLSNrRjFydLFR6hFCaN7kLeZq5BCPEV0VxFYAQ== 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 4dd2RC5RB2z18HF for ; Fri, 26 Dec 2025 10:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e2ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 10:48:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 3e5025ea3a5f - stable/14 - bhyve.8: Fix consistency and terms in manpage 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3e5025ea3a5f46d74bc1b9a2f793e25694e744c1 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 10:48:55 +0000 Message-Id: <694e6817.e2ca.69db476d@gitrepo.freebsd.org> The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=3e5025ea3a5f46d74bc1b9a2f793e25694e744c1 commit 3e5025ea3a5f46d74bc1b9a2f793e25694e744c1 Author: Michael Osipov AuthorDate: 2025-12-21 16:41:41 +0000 Commit: Michael Osipov CommitDate: 2025-12-26 10:48:19 +0000 bhyve.8: Fix consistency and terms in manpage Correct inconsistent spelling of terms and duplication. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54332 (cherry picked from commit 5819f8b285fc55a75e5dea56ffe73b376525150c) --- usr.sbin/bhyve/bhyve.8 | 61 +++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 90f34b3314f8..9f2934e27c6d 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 20, 2023 +.Dd December 23, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -374,7 +374,7 @@ PCI 16550 serial device. .It Cm lpc LPC PCI-ISA bridge with COM1, COM2, COM3, and COM4 16550 serial ports, a boot ROM, and, -optionally, a TPM module, a fwcfg type, and the debug/test device. +optionally, a TPM module, a fw_cfg type, and the debug/test device. The LPC bridge emulation can only be configured on bus 0. .It Cm fbuf Raw framebuffer device attached to VNC server. @@ -509,10 +509,10 @@ Disable emulation of guest trim requests via .Dv DIOCGDELETE requests. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or doesn't support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Pp @@ -532,10 +532,10 @@ are: Initiator ID to use when sending requests to specified CTL port. The default value is 0. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or not support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Pp @@ -611,10 +611,11 @@ address space, and any modifications the guest makes will be saved to that file. .El .Pp -Fwcfg types: +fw_cfg types: .Bl -tag -width 10n .It Ar fwcfg -The fwcfg interface is used to pass information such as the CPU count or ACPI tables to the guest firmware. +The fw_cfg interface is used to pass information such as the CPU count +or ACPI tables to the guest firmware. Supported values are .Ql bhyve and @@ -628,10 +629,13 @@ is used, bhyve's fwctl interface is used. It currently reports only the CPU count to the guest firmware. The .Ql qemu -option uses QEMU's fwcfg interface. -This interface is widely used and allows user-defined information to be passed to the guest. -It is used for passing the CPU count, ACPI tables, a boot order and many other things to the guest. -Some operating systems such as Fedora CoreOS can be configured by qemu's fwcfg interface as well. +option uses QEMU's fw_cfg interface. +This interface is widely used and allows user-defined information to +be passed to the guest. +It is used for passing the CPU count, ACPI tables, a boot order and +many other things to the guest. +Some operating systems such as Fedora CoreOS can be configured by +QEMU's fw_cfg interface as well. .El .Pp Pass-through device backends: @@ -667,10 +671,10 @@ Add as option ROM to the PCI device. The ROM will be loaded by firmware and should be capable of initializing the device. .It Li bootindex= Ns Ar index -Add the device to the bootorder at +Add the device to the boot order at .Ar index . -A fwcfg file is used to specify the bootorder. -The guest firmware may ignore or doesn't support this fwcfg file. +A fw_cfg file is used to specify the boot order. +The guest firmware may ignore or doesn't support this fw_cfg file. In that case, this feature doesn't work as expected. .El .Pp @@ -678,7 +682,7 @@ Guest memory must be wired using the .Fl S option when a pass-through device is configured. .Pp -The host device must have been reserved at boot-time using the +The host device must have been reserved at boot time using the .Va pptdevs loader variable as described in .Xr vmm 4 . @@ -793,7 +797,7 @@ standard PCI devices with BAR addressing, but may also implicitly decode legacy VGA I/O space .Pq Ad 0x3c0-3df and memory space -.Pq 64KB at Ad 0xA0000 . +.Pq 64 KiB at Ad 0xA0000 . The default .Cm io option should be used for guests that attempt to issue BIOS calls which result @@ -876,7 +880,7 @@ Serial number with maximum 20 characters. .It Cm eui64 IEEE Extended Unique Identifier (8 byte value). .It Cm dsm -DataSet Management support. +Dataset Management support. Supported values are: .Cm auto , enable , and @@ -899,14 +903,15 @@ Configuration options are defined as follows: .Bl -tag -width 10n .It Cm nmrr Nominal Media Rotation Rate, known as RPM. -Value 1 will indicate device as Solid State Disk. -Default value is 0, not report. +A value of 1 indicates that the device is a solid state drive, i.e., +non-rotational. +Default value is 0. .It Cm ser -Serial Number with maximum 20 characters. +Serial number with maximum 20 characters. .It Cm rev -Revision Number with maximum 8 characters. +Revision number with maximum 8 characters. .It Cm model -Model Number with maximum 40 characters. +Model number with maximum 40 characters. .El .Pp HD Audio device backends: @@ -1028,7 +1033,7 @@ or a similar boot loader before can be run. Otherwise, the boot loader is not needed. .Pp -To run a virtual machine with 1GB of memory, two virtual CPUs, a virtio +To run a virtual machine with 1 GiB of memory, two virtual CPUs, a virtio block device backed by the .Pa /my/image filesystem image, and a serial port for the console: @@ -1037,7 +1042,7 @@ bhyve -c 2 -s 0,hostbridge -s 1,lpc -s 2,virtio-blk,/my/image \\ -l com1,stdio -A -H -P -m 1G vm1 .Ed .Pp -Run a 24GB single-CPU virtual machine with three network ports, one of which +Run a 24 GiB single-CPU virtual machine with three network ports, one of which has a MAC address specified: .Bd -literal -offset indent bhyve -s 0,hostbridge -s 1,lpc -s 2:0,virtio-net,tap0 \\ @@ -1047,7 +1052,7 @@ bhyve -s 0,hostbridge -s 1,lpc -s 2:0,virtio-net,tap0 \\ -A -H -P -m 24G bigvm .Ed .Pp -Run an 8GB quad-CPU virtual machine with 8 AHCI SATA disks, an AHCI ATAPI +Run an 8 GiB quad-CPU virtual machine with 8 AHCI SATA disks, an AHCI ATAPI CD-ROM, a single virtio network port, an AMD hostbridge, and the console port connected to an .Xr nmdm 4