Date: Wed, 11 Aug 2021 22:14:15 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 30519e53dbad - stable/13 - Fix typo in xhci nvlist node name, and also increment device counter. Message-ID: <202108112214.17BMEFWI013852@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=30519e53dbad93a4d316a1b7d779dde26806a4d6 commit 30519e53dbad93a4d316a1b7d779dde26806a4d6 Author: Peter Grehan <grehan@FreeBSD.org> AuthorDate: 2021-04-03 04:32:54 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2021-08-11 22:12:38 +0000 Fix typo in xhci nvlist node name, and also increment device counter. This allows the xhci tablet device to be recognized and a PCI device instantiated. Reviewed by: jhb Fixes: 621b5090487d Refactor configuration management in bhyve. MFC after: 3 months. (cherry picked from commit ab899f8937c1c7c79197baf7192b727ddc9cfe54) --- usr.sbin/bhyve/pci_xhci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c index dd6dfc39d014..b71d66337048 100644 --- a/usr.sbin/bhyve/pci_xhci.c +++ b/usr.sbin/bhyve/pci_xhci.c @@ -2720,7 +2720,7 @@ pci_xhci_parse_devices(struct pci_xhci_softc *sc, nvlist_t *nvl) ndevices = 0; - slots_nvl = find_relative_config_node(nvl, "slots"); + slots_nvl = find_relative_config_node(nvl, "slot"); if (slots_nvl == NULL) goto portsfinal; @@ -2806,6 +2806,7 @@ pci_xhci_parse_devices(struct pci_xhci_softc *sc, nvlist_t *nvl) dev->dev_sc = devsc; XHCI_SLOTDEV_PTR(sc, slot) = dev; + ndevices++; } portsfinal:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108112214.17BMEFWI013852>