From owner-dev-commits-src-all@freebsd.org Wed Aug 11 22:14:13 2021
Return-Path: <owner-dev-commits-src-all@freebsd.org>
Delivered-To: dev-commits-src-all@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 A6FF265D408;
Wed, 11 Aug 2021 22:14:13 +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 4GlPHT49J7z4f9n;
Wed, 11 Aug 2021 22:14:13 +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 7682F16FE5;
Wed, 11 Aug 2021 22:14:13 +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 17BMED02013805;
Wed, 11 Aug 2021 22:14:13 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17BMEDNx013804;
Wed, 11 Aug 2021 22:14:13 GMT (envelope-from git)
Date: Wed, 11 Aug 2021 22:14:13 GMT
Message-Id: <202108112214.17BMEDNx013804@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: f08d1570fa76 - stable/13 - bhyve hostbridge: Rename "device"
property to "devid".
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jhb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: f08d1570fa760e98d82ec209a948a42dc49ab0da
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the src repository
<dev-commits-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-all/>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Help: <mailto:dev-commits-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Aug 2021 22:14:13 -0000
The branch stable/13 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=f08d1570fa760e98d82ec209a948a42dc49ab0da
commit f08d1570fa760e98d82ec209a948a42dc49ab0da
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2021-03-24 16:29:15 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2021-08-11 22:12:23 +0000
bhyve hostbridge: Rename "device" property to "devid".
"device" is already used as the generic PCI-level name of the device
model to use (e.g. "hostbridge"). The result was that parsing
"hostbridge" as an integer failed and the host bridge used a device ID
of 0. The EFI ROM asserts that the device ID of the hostbridge is not
0, so booting with the current EFI ROM was failing during the ROM
boot.
Fixes: 621b5090487de9fed1b503769702a9a2a27cc7bb
(cherry picked from commit 9f40a3be3d5dbddf782c3d1eeaadcd022a4dad01)
---
usr.sbin/bhyve/bhyve_config.5 | 4 ++--
usr.sbin/bhyve/pci_hostbridge.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5
index 4e200a779d50..d65040513cb0 100644
--- a/usr.sbin/bhyve/bhyve_config.5
+++ b/usr.sbin/bhyve/bhyve_config.5
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd March 18, 2021
+.Dd March 24, 2021
.Dt BHYVE_CONFIG 5
.Os
.Sh NAME
@@ -335,7 +335,7 @@ process.
.It Sy Name Ta Sy Format Ta Sy Default Ta Sy Description
.It Va vendor Ta integer Ta 0x1275 Ta
PCI vendor ID.
-.It Va device Ta integer Ta 0x1275 Ta
+.It Va devid Ta integer Ta 0x1275 Ta
PCI device ID.
.El
.Ss AHCI Controller Settings
diff --git a/usr.sbin/bhyve/pci_hostbridge.c b/usr.sbin/bhyve/pci_hostbridge.c
index 7099474eaf92..9fce225bb1d6 100644
--- a/usr.sbin/bhyve/pci_hostbridge.c
+++ b/usr.sbin/bhyve/pci_hostbridge.c
@@ -48,7 +48,7 @@ pci_hostbridge_init(struct vmctx *ctx, struct pci_devinst *pi, nvlist_t *nvl)
value = get_config_value_node(nvl, "vendor");
if (value != NULL)
vendor = strtol(value, NULL, 0);
- value = get_config_value_node(nvl, "device");
+ value = get_config_value_node(nvl, "devid");
if (value != NULL)
device = strtol(value, NULL, 0);
@@ -69,7 +69,7 @@ pci_amd_hostbridge_legacy_config(nvlist_t *nvl, const char *opts)
{
set_config_value_node(nvl, "vendor", "0x1022"); /* AMD */
- set_config_value_node(nvl, "device", "0x7432"); /* made up */
+ set_config_value_node(nvl, "devid", "0x7432"); /* made up */
return (0);
}