The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2ae9f7a453020a75c437e79773f019b4a8158bee
commit 2ae9f7a453020a75c437e79773f019b4a8158bee Author: John Baldwin <[email protected]> AuthorDate: 2023-01-26 22:24:55 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2023-01-26 22:24:55 +0000 bhyve: Fix a mismerge in the PCI passthrough device model. This block of code was removed in stable/13 commit 7ea16192a01e. It was accidentally re-added in commit aa5eea98b99c (probably due to resolving a conflict during the merge). This is a direct commit to stable/13. --- usr.sbin/bhyve/pci_passthru.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index 0c5f3ed1e7a3..3dbb80eec9fa 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -583,13 +583,6 @@ cfginitbar(struct vmctx *ctx __unused, struct passthru_softc *sc) sc->psc_bar[i].lobits = lobits; pi->pi_bar[i].lobits = lobits; - /* The MSI-X table needs special handling */ - if (i == pci_msix_table_bar(pi)) { - error = init_msix_table(ctx, sc); - if (error) - return (-1); - } - /* * 64-bit BAR takes up two slots so skip the next one. */
