From nobody Fri Jul 4 13:28:58 2025 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 4bYZGf6Mllz615Fb; Fri, 04 Jul 2025 13:28:58 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bYZGf2B55z3M9L; Fri, 04 Jul 2025 13:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751635738; 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=cakRu9qiR51nn6/lJ7fPzAE55jc5NVHhY+hKvCFcFXU=; b=rRRSdFDJ3/vcXZaFdAeHBJmnEeh+MXcDwIVIouSCyZ/mUuS8qCWGQX1b9Zq2gdTNH7HBG4 Di10vBJreQpZ2pd5ZGZE1unECPOxgoGU4j/k7eyjmeBJc3c8K0zCACl1l9KxohGI2RKh4u JZxZ+YyhGW0qZp6O7Rf9FmT5FJByAZElpbDKRSW/49YhF5JRaH/JGZ1svTvLVnYIk3GSXE mvxtH2CQxI+pv4Y9N7D1YxaYBzIAxszO9sjtBEMp8ZzkUwJx2J2SFvU5ww35x0/HnNKn87 BsugR7kM+tfwBDzEAPCHLhIf8Q3LkbZpM07zyu5MWk4fswJH0+Phm2Pela3psQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751635738; 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=cakRu9qiR51nn6/lJ7fPzAE55jc5NVHhY+hKvCFcFXU=; b=PVj+iWyqAu2rnItCFSHLFQgMBJ+i4Vqw5+gpDj8phzHV1+fm3FW0JAK8I6QBnAxYEh78lT MzCPoRpvvYDmRRPSOItZWWcikNTyHBQAr8dWsmuyTcab78jUiTEXzMsAY8EwjoUQ66a0wk PVQe4JwLVchYFRUIAxF7pX4/dIzxq0ASSjckdXu7grJZUo21uyeWD4E67/Ek6jt6TVeh/P 9JgMA6azh9Bt33JNh7YJ6+M0P2m3fhgul+bxJW2RLaIPi9Y4KWlYt/zGRwnzQpYfbyFZ3s Gl5eHWJNTI147W+o2xQnCHzNQw45RTHSMzoVg0Gr/6UBPk8sMrYha1A/OAl+bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751635738; a=rsa-sha256; cv=none; b=DDlnt55qyI9pyJNODLvGZ3Vb6xzUGKvzN9XuDo6wgWZdUQ6v43tjZrPxVZKqTZpsXO/JNh 4T9vtfugUFpwtFJboLe47o+nFpVKF5qtM4KowXXK9N6aXomHdUCWiFpzCj4StioAdGT40F VlPBdijwDxT3L+Veb82NvoawEb/EANxY2tzwdIvw/egaTpZzHktoyfWURmUXZuyswj0R9q Au0h3nwLpcaKkSLwnyfpeUi5NfNpo6KvjbJITqrmqyw7AH+jnfU52aWec6rLFlzxNWbLhV kOnHHyvDYpzYAI8xIxUcLjqmSqzKRxH3NeVP79mQ7IPQ/tmYIUCWxC7bXtLfGg== 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 4bYZGf1nj7zrc0; Fri, 04 Jul 2025 13:28:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 564DSwmu006237; Fri, 4 Jul 2025 13:28:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 564DSwn2006234; Fri, 4 Jul 2025 13:28:58 GMT (envelope-from git) Date: Fri, 4 Jul 2025 13:28:58 GMT Message-Id: <202507041328.564DSwn2006234@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Popov Subject: git: b7ef7f8b0b65 - stable/14 - virtio_p9fs: Support attaching to pci and mmio 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b7ef7f8b0b65e67da6ab11441b365684f231250f Auto-Submitted: auto-generated The branch stable/14 has been updated by arrowd: URL: https://cgit.FreeBSD.org/src/commit/?id=b7ef7f8b0b65e67da6ab11441b365684f231250f commit b7ef7f8b0b65e67da6ab11441b365684f231250f Author: Andrew Turner AuthorDate: 2025-04-08 10:27:20 +0000 Commit: Gleb Popov CommitDate: 2025-07-04 13:28:07 +0000 virtio_p9fs: Support attaching to pci and mmio Some implementations of the virtio 9p transport are implemented on virtio_mmio, e.g. the Arm FVP. Use the correct macro so the driver attaches when this is the case. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D49600 (cherry picked from commit fd9f67e689e83f20e29edf63cc6488402de5901c) --- sys/dev/virtio/p9fs/virtio_p9fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index d359fbbf1a3d..67426a88bceb 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -484,7 +484,7 @@ vt9p_modevent(module_t mod, int type, void *unused) return (error); } -DRIVER_MODULE(virtio_p9fs, virtio_pci, vt9p_drv, vt9p_modevent, 0); +VIRTIO_DRIVER_MODULE(virtio_p9fs, vt9p_drv, vt9p_modevent, NULL); MODULE_VERSION(virtio_p9fs, 1); MODULE_DEPEND(virtio_p9fs, virtio, 1, 1, 1); MODULE_DEPEND(virtio_p9fs, p9fs, 1, 1, 1);