From nobody Tue Aug 11 14:24:27 2026 X-Original-To: dev-commits-src-all@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 4hKDQh1PVWz6nnSd for ; Tue, 11 Aug 2026 14:24:28 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hKDQg6Wbhz3vhp for ; Tue, 11 Aug 2026 14:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786458267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d7TMYDO21/sywNel3kjfZ4TRdyxSKGDLngF9PAj0ts0=; b=D2E+FJGmCnkemkfAfNz+2kQD2G23q9ghKhFKUrlH+4dPvFmx9m0HvZCFgZNNU3lv8CN+Y2 Pt7gUII5PVE/puQHzwOwtIUjDdWKrEtTrXMaj+r6nPDtAFds2dFzMJhMrzn+0Wnn+FO1p9 urC3foXE7mEnfzfbCTcfl0o0wUJe2JLaaY26Zs1/XvbnUsTREpTpZqwb7/bz1bBeQi0uX9 cFNzMHWVFP2ctLneTOl2k3L42PbHGtFr1l5qP3yQMjxAExZAtAYQmsNKB2OMbC/70g7SFB GWcBPzZi0SxqRX7euBocKhRVIYeZmpmimYG+wNBAG8mAlAG5salEBeLenL8QBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786458267; a=rsa-sha256; cv=none; b=QtobP87She82s57l/fawxeH9JhRUjoHzMC866rIPgGeaGmNgHUfU4ZBKUly1ov4kuvlRIR CKfoDjk7mF/iGhULMzYxYd+0+RIGgoJlBedQ45Kgh9tas64BrE3NRms5FqEx9+IRfVMea1 otl+Vo0/KGFyhXw4Oic/mbKm/ZC3c80oYC8+bBltY0bHD6H3YkB6j9D7v+6oHkwTLemGsy 6bpAMKesjwzDDcKdPEfWy4kVM3r9vsoW+lycpQPrQ94d6290vBsu1X5r/ux4Wce85lbWTt wzQTzbFwX5zvuTWQYCEn+GkSZK6VTxof5wtMxZpfjnT7/iTEl1sr80UR1/XC/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786458267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d7TMYDO21/sywNel3kjfZ4TRdyxSKGDLngF9PAj0ts0=; b=elILpTOtElwrkN1flp/RQ3wTpuax1zuD69HJ8us2dmgS3GhnkpiIzeZZuMaLuLmFeHgfej 0H4Dn1pp/+73JN4FoBWM3OHl/xb2lFd6bU3BxU58/4kHU5sRt5X/nPDmMxyC8hM/ws4Xs2 o11l6d2+jLipj+6FMVH7ir6v9HnzAqf1R3JlPh0ZPkXFr+dGHPaZs86hnIQiG3mReyGFFW FQ7JmlXjcL3c3CMCaUQWbMAdXag864pxUIIBrbePWJQQhd9tsyALdj4PoV7C0X7brgsTeV 1z0rLpq+wwlfGaB0Pn4Y1KfS8scx+Vr9/+L6umOQpGuL9Hbu5u/dy5osp8IJAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hKDQg5cJxzyXf for ; Tue, 11 Aug 2026 14:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25619 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 11 Aug 2026 14:24:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Nimish Jain From: Mark Johnston Subject: git: 2d985d577d79 - main - bhyve: namescope virtio_msix to virtio.msix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d985d577d79605bde7f7b77c97da0ad59acf629 Auto-Submitted: auto-generated Date: Tue, 11 Aug 2026 14:24:27 +0000 Message-Id: <6a7b309b.25619.71d9e0e2@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2d985d577d79605bde7f7b77c97da0ad59acf629 commit 2d985d577d79605bde7f7b77c97da0ad59acf629 Author: Nimish Jain AuthorDate: 2026-08-11 14:12:41 +0000 Commit: Mark Johnston CommitDate: 2026-08-11 14:15:04 +0000 bhyve: namescope virtio_msix to virtio.msix The bhyve_config(5) variable `virtio_msix` is namescoped to `virtio.msix`. Configurations that have the old variable will automatically be mapped to the new one, with a warning message printed out. Relnotes: yes Reviewed by: ziaee, markj Differential Revision: https://reviews.freebsd.org/D58390 --- usr.sbin/bhyve/aarch64/bhyverun_machdep.c | 5 ++++- usr.sbin/bhyve/amd64/bhyverun_machdep.c | 3 ++- usr.sbin/bhyve/bhyve_config.5 | 4 ++-- usr.sbin/bhyve/riscv/bhyverun_machdep.c | 5 ++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/aarch64/bhyverun_machdep.c b/usr.sbin/bhyve/aarch64/bhyverun_machdep.c index 7d82784131b4..56390719471b 100644 --- a/usr.sbin/bhyve/aarch64/bhyverun_machdep.c +++ b/usr.sbin/bhyve/aarch64/bhyverun_machdep.c @@ -183,7 +183,7 @@ bhyve_optparse(int argc, char **argv) set_config_value("uuid", optarg); break; case 'W': - set_config_bool("virtio_msix", false); + set_config_bool("virtio.msix", false); break; case 'h': bhyve_usage(0); @@ -191,6 +191,9 @@ bhyve_optparse(int argc, char **argv) bhyve_usage(1); } } + + /* Handle backwards compatibility aliases in config options. */ + bhyve_cfg_warn("virtio_msix", "virtio.msix"); } void diff --git a/usr.sbin/bhyve/amd64/bhyverun_machdep.c b/usr.sbin/bhyve/amd64/bhyverun_machdep.c index 5b23807b30d5..50085c928fde 100644 --- a/usr.sbin/bhyve/amd64/bhyverun_machdep.c +++ b/usr.sbin/bhyve/amd64/bhyverun_machdep.c @@ -250,7 +250,7 @@ bhyve_optparse(int argc, char **argv) set_config_bool("x86.strictmsr", false); break; case 'W': - set_config_bool("virtio_msix", false); + set_config_bool("virtio.msix", false); break; case 'x': set_config_bool("x86.x2apic", true); @@ -268,6 +268,7 @@ bhyve_optparse(int argc, char **argv) /* Handle backwards compatibility aliases in config options. */ bhyve_cfg_warn("lpc.bootrom", "bootrom"); bhyve_cfg_warn("lpc.bootvars", "bootvars"); + bhyve_cfg_warn("virtio_msix", "virtio.msix"); } void diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index a12540d054c7..8ed2281f43a9 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 8, 2026 +.Dd August 10, 2026 .Dt BHYVE_CONFIG 5 .Os .Sh NAME @@ -169,7 +169,7 @@ The universally unique identifier (UUID) to use in the guest's System Management BIOS System Information structure. If an explicit value is not set, a valid UUID is generated from the host's hostname and the VM name. -.It Va virtio_msix Ta bool Ta true Ta +.It Va virtio.msix Ta bool Ta true Ta Use MSI-X interrupts for PCI VirtIO devices. If set to false, MSI interrupts are used instead. .It Va config.dump Ta bool Ta false Ta diff --git a/usr.sbin/bhyve/riscv/bhyverun_machdep.c b/usr.sbin/bhyve/riscv/bhyverun_machdep.c index adbba6bcce60..8efaa2aa4124 100644 --- a/usr.sbin/bhyve/riscv/bhyverun_machdep.c +++ b/usr.sbin/bhyve/riscv/bhyverun_machdep.c @@ -174,7 +174,7 @@ bhyve_optparse(int argc, char **argv) set_config_value("uuid", optarg); break; case 'W': - set_config_bool("virtio_msix", false); + set_config_bool("virtio.msix", false); break; case 'h': bhyve_usage(0); @@ -182,6 +182,9 @@ bhyve_optparse(int argc, char **argv) bhyve_usage(1); } } + + /* Handle backwards compatibility aliases in config options. */ + bhyve_cfg_warn("virtio_msix", "virtio.msix"); } void