From nobody Wed Sep 30 15:54:08 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 4hw0346bG3z6tjyw for ; Wed, 30 Sep 2026 15:54: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hw0345xm0z4T0c for ; Wed, 30 Sep 2026 15:54:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790783648; 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=17Ns+/l5LQt+bZgmaK5Jjy6NuO5wpYJiwFUXDFfJz5Y=; b=QvaUnPqOXEX7xU8+PeU8+zdon/qBnMWiC72rAuGoMNZjtAhNwG1IKK/C09Q14dPAf/Pbm9 iQmoKKvpdEmADwqUqTXzOXila3Mml5vosSF3HwKnj4IZaIY+lDJNkN3J4B5dTgYgFp25AA 2026EfcBxOSZbM4CWvLPvJaAbpa15bN4gNXPqHqIlrsbNMgyCO1MNeQf7tbi7E5aOZ1v9n J2smNF+O3OEUHhccs8yfbn8RkwUf2s19K72XllLDvraqbMkixOEGdHDoV8olLwVuOUfZ6Q 1g71+uDXbW/XN0MsjOWaVdxhDC8uTJ9LVzfNAiD4Gr7XVQmOtf4/rpQ9NB8fbQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790783648; b=RUOH3aeLydtWbQunq317Eu9C7iDI2eX9RQOXoERga6BoBoGlK5XCI89pwFtZJcIAFdGo7t 2ynQm0ScoAWzz2v/T1uZD9+MNC0WzD9nPLGd1R5qziPmio5R6DojHRySOsO6Odd53wDjY3 7uTw5OB/zCn1QcCtlpJ72zWKXbKZybvysRyQk1H6Bj+4VYiMhGWJnuSOfw7xHEqZRhZhpn Spn7KHNFwuC/krUpdguKNXrcayeHtvRcSqRv3Cy55uELZpJf/Cgz7Qr1q9zGNYRduygwPx U/oUlFVD+XFCWUZFGA14mS2EYY+ok35grlxAmFcqUXhBfSm9oHbOxLToCACJ/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790783648; 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=17Ns+/l5LQt+bZgmaK5Jjy6NuO5wpYJiwFUXDFfJz5Y=; b=CVLMLR9y5cOSQvx+kQMqr2+BN8fPLWUimdX/YoVoSENKUx8fsIiek42Md73coQ3CyQIdag wnjmfodlxrN9V8kq/kzxt49Q8D72vx6LM7+5VSFvLEH6O5d5AKD+yDujwwNoXIe4C2/eJN tby9f6E4Wrya6xVuximg2L24bfEt0YnvyEOEDGJNKFEOkcZTdjvxMQPjsETce3FuHVwZ7J hkl7jERRbt33wTtibCSSpOocHz4IZKoB56vifH68SsCIW8Wt/8xe3Gh5OmS6Jt2eyA2gls v63b+3ZD4RJ1S9oTw/DofZ6eJ9i99YBPRlW+J1kjImof8ABRGBkOzsL49BSdxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hw0344zs6zsVP for ; Wed, 30 Sep 2026 15:54:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33ce0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 15:54:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hayzam Sherif From: Mark Johnston Subject: git: 8c7ce2d48abf - main - bhyve: Defer virtio-console PORT_NAME until the guest is ready 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: 8c7ce2d48abfbf9fc08dccfb469fcc687c3cd68a Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 15:54:08 +0000 Message-Id: <6abd30a0.33ce0.93b998a@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8c7ce2d48abfbf9fc08dccfb469fcc687c3cd68a commit 8c7ce2d48abfbf9fc08dccfb469fcc687c3cd68a Author: Hayzam Sherif AuthorDate: 2026-09-30 14:16:38 +0000 Commit: Mark Johnston CommitDate: 2026-09-30 15:53:51 +0000 bhyve: Defer virtio-console PORT_NAME until the guest is ready pci_vtcon_announce_port() sends VIRTIO_CONSOLE_PORT_NAME immediately after VIRTIO_CONSOLE_DEVICE_ADD, without waiting for the guest to initialize the port. The Windows virtio-serial driver ignores the name if the port is not yet available, which can prevent the QEMU guest agent from finding org.qemu.guest_agent.0. Send the name after the guest reports successful port initialization with VIRTIO_CONSOLE_PORT_READY, as QEMU does. While here, validate the guest-supplied port ID before forming a pointer into vsc_ports[]. This ports the PORT_NAME ordering fix from illumos change 18082. Obtained from: illumos 643ee887be44404b690eeaff14f20a27ad3c715c Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D59847 --- usr.sbin/bhyve/pci_virtio_console.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/pci_virtio_console.c b/usr.sbin/bhyve/pci_virtio_console.c index 2950c2276942..0efaba317d2f 100644 --- a/usr.sbin/bhyve/pci_virtio_console.c +++ b/usr.sbin/bhyve/pci_virtio_console.c @@ -515,13 +515,26 @@ pci_vtcon_control_tx(struct pci_vtcon_port *port, void *arg __unused, break; case VTCON_PORT_READY: + if (ctrl->id >= VTCON_MAXPORTS) { + WPRINTF(("VTCON_PORT_READY event for unknown port %d", + ctrl->id)); + return; + } tmp = &sc->vsc_ports[ctrl->id]; - if (ctrl->id >= VTCON_MAXPORTS || !tmp->vsp_enabled) { + if (!tmp->vsp_enabled) { WPRINTF(("VTCON_PORT_READY event for unknown port %d", ctrl->id)); return; } + if (ctrl->value == 1) { + resp.id = ctrl->id; + resp.event = VTCON_PORT_NAME; + resp.value = 1; + pci_vtcon_control_send(sc, &resp, tmp->vsp_name, + strlen(tmp->vsp_name)); + } + if (tmp->vsp_console) { resp.event = VTCON_CONSOLE_PORT; resp.id = ctrl->id; @@ -541,10 +554,6 @@ pci_vtcon_announce_port(struct pci_vtcon_port *port) event.event = VTCON_DEVICE_ADD; event.value = 1; pci_vtcon_control_send(port->vsp_sc, &event, NULL, 0); - - event.event = VTCON_PORT_NAME; - pci_vtcon_control_send(port->vsp_sc, &event, port->vsp_name, - strlen(port->vsp_name)); } static void