From owner-dev-commits-src-branches@freebsd.org Mon Aug 16 09:04:05 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@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 6705667012D;
Mon, 16 Aug 2021 09:04:05 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Gp7WS6vN1z3RDl;
Mon, 16 Aug 2021 09:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D20E0269B7;
Mon, 16 Aug 2021 09:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17G944PO069298;
Mon, 16 Aug 2021 09:04:04 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17G944iF069297;
Mon, 16 Aug 2021 09:04:04 GMT (envelope-from git)
Date: Mon, 16 Aug 2021 09:04:04 GMT
Message-Id: <202108160904.17G944iF069297@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mateusz Piotrowski <0mp@FreeBSD.org>
Subject: git: 7dcc31c9b790 - stable/13 - bhyve.8: Clean up the slot
description of -s
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: 0mp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 7dcc31c9b790a8b3a7e9d00b22e41740d18dddea
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Aug 2021 09:04:05 -0000
The branch stable/13 has been updated by 0mp (doc, ports committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=7dcc31c9b790a8b3a7e9d00b22e41740d18dddea
commit 7dcc31c9b790a8b3a7e9d00b22e41740d18dddea
Author: Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2021-04-18 20:56:19 +0000
Commit: Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2021-08-16 08:56:50 +0000
bhyve.8: Clean up the slot description of -s
Also, remove the macros of the nested list which contained slot,
emulation and conf. This decreases the indention of the -s description.
It was necessary to clean up the slot description.
MFC after: 2 weeks
(cherry picked from commit 234d8c470b44160fe0cbce49b972b3b19f246a89)
---
usr.sbin/bhyve/bhyve.8 | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8
index e58c877dacbe..8e1a33ea4b42 100644
--- a/usr.sbin/bhyve/bhyve.8
+++ b/usr.sbin/bhyve/bhyve.8
@@ -243,10 +243,23 @@ provides PCI bus emulation and virtual devices that can be attached to
slots on the bus.
There are 32 available slots, with the option of providing up to 8 functions
per slot.
-.Bl -tag -width 10n
-.It Ar slot
-.Ar pcislot[:function]
-.Ar bus:pcislot:function
+.Pp
+The
+.Ar slot
+can be specified in one of the following formats:
+.Pp
+.Bl -bullet -compact
+.It
+.Ar pcislot
+.It
+.Sm off
+.Ar pcislot Cm \&: Ar function
+.Sm on
+.It
+.Sm off
+.Ar bus Cm \&: Ar pcislot Cm \&: Ar function
+.Sm on
+.El
.Pp
The
.Ar pcislot
@@ -263,7 +276,11 @@ value defaults to 0.
If not specified, the
.Ar bus
value defaults to 0.
-.It Ar emulation
+.Pp
+The
+.Ar emulation
+argument
+can be one of the following:
.Bl -tag -width 10n
.It Li hostbridge | Li amd_hostbridge
.Pp
@@ -313,8 +330,10 @@ NVM Express (NVMe) controller.
.It Li hda
High Definition Audio Controller.
.El
-.It Op Ar conf
-This optional parameter describes the backend for device emulations.
+.Pp
+The optional parameter
+.Ar conf
+describes the backend for device emulations.
If
.Ar conf
is not specified, the device emulation has no backend and can be