From nobody Thu Jan 26 19:25:52 2023 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 4P2rKF2QSWz3bTh5; Thu, 26 Jan 2023 19:25:53 +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 4P2rKF1XJvz4JGT; Thu, 26 Jan 2023 19:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761153; 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=xS2z4A++Yd1BuRYLAdy9ZFZEHyqEJ6NCfM0H/tNs9eg=; b=FUEUKm1EK40yodeIYVPC6l/T0+Jiwt1rht0Zo3W38EBbmY+okUfbaXEIwrCsbukQuNBUFP l/DbeufvRFPPlju09xKe3KD6oOi3CiBlEOnXtThihd5ZUeGwhvEOdEZtlVteJxleydilJ1 JKW88yf4D/klFntTI52ErXQuU8NgNkdRyOo2fNxFsqreBf9+HAy+iEaLIGjwCkNbFJf9T/ YaCmdXV88cjVPi+LDTQOppqwgZsSR4Pd0krAnEDYqVjHkiXlAcKSC40BpSPCHqh2uWpn2+ 9tCKcNBr46ObJemQhEbue+OC40uOaLFI1rd8TlF25YGGM+LNan/tPBZh28HEUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761153; 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=xS2z4A++Yd1BuRYLAdy9ZFZEHyqEJ6NCfM0H/tNs9eg=; b=sAmGxij+Jj2deznhyJu+uOerxVYy+L3f6PDU5HQ6g+s684x1aQ4JTI08j+SgBL365wGiGf 0pnctyYxcP8PnDIEmQCv/PyCtr21DapPV//h3DSMwe8D17O9MdPeh/JR/hz8R6eyjGqxhH mSeW8jtvgGuSQgpT9ssbqfMLhxhjN0CVTqu69VIaaM7A65fP+fhrsSr4GlTomZZxGMaEez fpOMHs0X+BUVxkhnXa4u/m0FUmypdu7J8qKltkbb2vTURU8wHCz4EBAaPaD3386oDElO7T mV576TKzuZJPuSmvASFH2T+45wQekAfmx8nelFXzhEZEhm9zTeBIjero4nkVsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674761153; a=rsa-sha256; cv=none; b=ktXbYDzWhKeKoZz4EHOhmWbWcu888MsHDLLb1/xFAO4KY6AMBWQeEgw0bLK1P3lzndb31a X89Xp6cRo6u/9xANl48JoDjqay4UcyXpHE3VXMnTwI/YmRZmluw92wcon4R40QTaeLPs4a W/Q+lDt8VuC81iAXvMasf7jwdZKcEWdAGjLialg6crNR1BohdDPGl91U8zD69W1erKSA3p XrOi4pFqNvCZMmSn4MjI3YZ1SYhTdQq83j0TOforpVyZoZK3JSwfv/xwegGu/QrX/mOG6g 0irZwxyh8e6LnzX+ORoDzncdlXiBXga7yHyRhc5LyYIfDTSmNdsBiQFdJiZQCw== 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 4P2rKF0dMHzhC2; Thu, 26 Jan 2023 19:25:53 +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 30QJPqnS078027; Thu, 26 Jan 2023 19:25:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QJPqgH078026; Thu, 26 Jan 2023 19:25:52 GMT (envelope-from git) Date: Thu, 26 Jan 2023 19:25:52 GMT Message-Id: <202301261925.30QJPqgH078026@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: 5fdcc90fb0ff - stable/13 - bhyve: Fix virtio-console legacy configuration parsing 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 5fdcc90fb0ff0e18ec55a2d481648f729a759c63 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5fdcc90fb0ff0e18ec55a2d481648f729a759c63 commit 5fdcc90fb0ff0e18ec55a2d481648f729a759c63 Author: Yan Ka Chiu AuthorDate: 2022-05-06 19:31:56 +0000 Commit: John Baldwin CommitDate: 2023-01-26 19:23:54 +0000 bhyve: Fix virtio-console legacy configuration parsing virtio-console is currently missing .pe_legacy_config, which prevents any portN configuration from being parsed, and therefore no sockets will be created. Reviewed by: khng MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D35142 (cherry picked from commit 3cdfaefa4b88c928bfb62e7fb6c7f7742d81f31c) --- usr.sbin/bhyve/pci_virtio_console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_virtio_console.c b/usr.sbin/bhyve/pci_virtio_console.c index d16668e6a2cb..341f0857bade 100644 --- a/usr.sbin/bhyve/pci_virtio_console.c +++ b/usr.sbin/bhyve/pci_virtio_console.c @@ -756,6 +756,7 @@ static const struct pci_devemu pci_de_vcon = { .pe_emu = "virtio-console", .pe_init = pci_vtcon_init, .pe_barwrite = vi_pci_write, - .pe_barread = vi_pci_read + .pe_barread = vi_pci_read, + .pe_legacy_config = pci_vtcon_legacy_config, }; PCI_EMUL_SET(pci_de_vcon);