From nobody Thu Jan 26 22:35:07 2023 X-Original-To: dev-commits-src-branches@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 4P2wWc0V6Tz3cCMy; Thu, 26 Jan 2023 22:35:08 +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 4P2wWb65ygz4DfM; Thu, 26 Jan 2023 22:35:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674772507; 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=hEwjf5LvZt2Q/yo1qCDh1ot4uUcnhNNWDrAwbnjzFZI=; b=cN9FFbeNcMaVPiWPluwERU053H/4Xt5whj13e+sCnVyMe/joVnIhsKmWuunsoR2nCi7j/1 l9tqwa3a42y5lkc6GMzZNsL4CRTcX9PaVd3W76cszQqg2DYs+A6rBEYUQL7rG/zO8YlU/+ 1Qfr/iwmRx8oMtcQjRu/Y3uXrfHJ9X/jGU9AApdrsWBS/SMplknrENaIzRxFhnAD5bGFyR WN7hFoO5W11Nm7meBiTrKBVujIWPPnl2gxkMkU+OPa0TYSa4LiG1Pv5ucSDNrpzcAGrXGe 1JU3s7NJRqxE1u2WZGeKBU2z82ld2L+tIzo/SQRP5n/HJkMCsF1G8tv/zVJi6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674772507; 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=hEwjf5LvZt2Q/yo1qCDh1ot4uUcnhNNWDrAwbnjzFZI=; b=XYAGltlkk4neU7vm8WDJVCWYfuSHMV36d8bzB0ft61e7vXzqY8owzABpFH1Mv2VnHJDtUN 2ydIOji5XVvDQGwe5XF+jIdRvdztkQ0IYbD7uLEu2b5cdsoZR7KWt/oE+1xz6FQZor9HGA EFLDjlEQJwz8gHe3XWx7jcDLV0w5Wq4UZLXA+aW8TmaP5D2Ridgroc4jRgJ2IU2TXKZuN/ YKLiaxWIsdYp/fWQMLMkff3By7e0NZirCcJda1/f1XSByQIetyW9r7Iv8x296McGDaF9Bd KiHaCnatR0c8w0gNprYKl9WClRaBqn9W3lsO9SrhIozelyX+qOrGQE0ZiywCNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674772507; a=rsa-sha256; cv=none; b=Z3W0H9BynnUn/omCNYOX3ILh6bYtuWKIzAmf6XpVWfLirXw08UekjmmnrQn3pZS8FxIMTo ldvpFApLp0yMUGDCdK2sYyhVqD1jBUMRES4Sa1yxvzbRAckA/rivtIWXTwEFiFKPW6qsOt 8oJt8bk2j8OMX6kG9UdNPxw4na0WR4wku7L9CDvX+S+vwCGzKH2szi6zTwDRp5JqIXz0fT nya9ugw/it+01IspH47wQcVIIPu5Krnw0/sihLSRj6e5IQ7hwyrsyqs2zBWxEpy/4j/To/ xykLN41dxfXFUyA0J3TaREmbV+sL9j1hHLuFw0eG+LgMUWsOMRNx0JLbovEOMQ== 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 4P2wWb4yp3zmK8; Thu, 26 Jan 2023 22:35:07 +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 30QMZ7W0051696; Thu, 26 Jan 2023 22:35:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMZ7Jt051695; Thu, 26 Jan 2023 22:35:07 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:35:07 GMT Message-Id: <202301262235.30QMZ7Jt051695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 2ae9f7a45302 - stable/13 - bhyve: Fix a mismerge in the PCI passthrough device model. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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: 2ae9f7a453020a75c437e79773f019b4a8158bee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2ae9f7a453020a75c437e79773f019b4a8158bee commit 2ae9f7a453020a75c437e79773f019b4a8158bee Author: John Baldwin AuthorDate: 2023-01-26 22:24:55 +0000 Commit: John Baldwin 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. */