From nobody Thu Oct 22 17:32:18 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 4j9YBB71Bqz6xPVY for ; Thu, 22 Oct 2026 17:32:18 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j9YBB4Nbrz3HdS for ; Thu, 22 Oct 2026 17:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690338; 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=q9LQBu5RaXF8aN8a6FDkqnUaD40AtIbi21x4jYzt9T8=; b=kgUFtaxpNpni1SGrMxDXtG+9qTlyIsLDmaqi5QU99xq52vxpeh1u4VvxviZXKPmfEU0HBo na2zx2V1B+R3K6mBHbCLLDB93O7Itz84js37ZomiF/e0k07r5T8MBQ6Xcnlr4UTjNu4XlI 0kQvX1Xk3wMozk8F9b23ay+5bDfs5heLtc9GuZ4myfY+ZJE1vJ7wKOaBQe0HoiJgBT7OS4 F8Q3EIWzu5il0bARH8nYIOVIUQeY++XyFA8WRLuw1MvOylWLWhgy5LB298NVktpyEoZDax kh00yPyacuuBGnt7I95dG5MsYH1YZOt/NdKCm6mYYmg62GGvIGtKCx9E0Z1C1Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690338; b=UFsRjYk3hURSkAioDTObbJLfsIbDls2Y2u1yji1I8wkl4ol56NXslFVENFAfQ5YyYiEb93 q5IrhRjSiW47uS6UaH5WOcgWGx6I3k8W72JqIwEnEhndCSRap8Bt4cWxs993DBgnAC+J7b T98YdOkbKH6IyzDCeigLG6GnRsA7hiDE8GgBi4Rd0Xwn9ja9qPMkX5XOFIsFA+S+saKRK8 OCidVQQZ9ha68hIs0L25nelOcjR9nMKA15B0J2gBamGUzlh6/NMUutNwMUIxNnQq67CuYz CrAVKm0BNrjI2O1gET+7X6Tdp9xDXAZSOpZSbE3shFH6ZBTrYuzjE7P0BMahAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690338; 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=q9LQBu5RaXF8aN8a6FDkqnUaD40AtIbi21x4jYzt9T8=; b=aHgH0DrI6p7HJFHL1qXLqFBqbI0Maj3wZTRI41Efj6CM5CQ4GQCV1pN5FqsvVlv/yEjc3d 1QF5FOHWklydrCz1kPzQztl0LtjTu0431T8ooY20S75F4Ma/gMeIuKOPx6z7ZT9yPyds0D F2a/nnbEuDijkrnkj+VwoVp07tuSR+90hGZPD7hzFCf5ZYqCTtLcKS0+UgnveiCZA3LVb+ iXFu59VDt8fmbjtGPDAFn51UO7uz/a49la+5FhBrf9NCRVfJEtg59S1m8eX4VrgMo/l3t5 AqtUWXNJc7LthQmoHdhp2AmAQNh2QaLyRvifaVHUJ+ZDcfWmYoCtnIXO72GJqg== 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 4j9YBB3shrzsVt for ; Thu, 22 Oct 2026 17:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d74e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:32:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Hayzam Sherif From: Mark Johnston Subject: git: 808b711e58c8 - stable/15 - bhyve: Defer virtio-console PORT_NAME until the guest is ready List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 808b711e58c886ef9a81ce97e3eb5a3a69cdf5f4 Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:32:18 +0000 Message-Id: <6ada48a2.3d74e.77757b06@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=808b711e58c886ef9a81ce97e3eb5a3a69cdf5f4 commit 808b711e58c886ef9a81ce97e3eb5a3a69cdf5f4 Author: Hayzam Sherif AuthorDate: 2026-09-30 14:16:38 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:41 +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 (cherry picked from commit 8c7ce2d48abfbf9fc08dccfb469fcc687c3cd68a) --- 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