From owner-dev-commits-src-main@freebsd.org Thu Jan 21 01:36:13 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C12344E0F8F; Thu, 21 Jan 2021 01:36:13 +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 4DLlNF56lvz4bdR; Thu, 21 Jan 2021 01:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A2A6323529; Thu, 21 Jan 2021 01:36:13 +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 10L1aDYx066087; Thu, 21 Jan 2021 01:36:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10L1aDoG066086; Thu, 21 Jan 2021 01:36:13 GMT (envelope-from git) Date: Thu, 21 Jan 2021 01:36:13 GMT Message-Id: <202101210136.10L1aDoG066086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 32cb85d0f1e8 - main - Build VirtIO modules on all architectures MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32cb85d0f1e806ac2147fefff6b6e3bd107ba4c1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2021 01:36:13 -0000 The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=32cb85d0f1e806ac2147fefff6b6e3bd107ba4c1 commit 32cb85d0f1e806ac2147fefff6b6e3bd107ba4c1 Author: Jessica Clarke AuthorDate: 2021-01-21 01:21:35 +0000 Commit: Jessica Clarke CommitDate: 2021-01-21 01:21:35 +0000 Build VirtIO modules on all architectures Currently only amd64, i386 and powerpc build VirtIO modules, yet all other architectures have at least one kernel configuration that includes the transport drivers, and so they lack drivers for all the devices they don't statically compile into the kernel. Instead, enable the build everywhere so all architectures have the full set of device drivers available. Reviewed by: bryanv (earlier version), imp (earlier version) Differential Revision: https://reviews.freebsd.org/D28058 --- share/man/man4/Makefile | 32 ++++++++------------------------ sys/modules/Makefile | 4 +--- 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index fa2af9d32aea..ffc7a08292e9 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -564,12 +564,12 @@ MAN= aac.4 \ vge.4 \ viapm.4 \ ${_viawd.4} \ - ${_virtio.4} \ - ${_virtio_balloon.4} \ - ${_virtio_blk.4} \ - ${_virtio_console.4} \ - ${_virtio_random.4} \ - ${_virtio_scsi.4} \ + virtio.4 \ + virtio_balloon.4 \ + virtio_blk.4 \ + virtio_console.4 \ + virtio_random.4 \ + virtio_scsi.4 \ ${_vmci.4} \ vkbd.4 \ vlan.4 \ @@ -580,7 +580,7 @@ MAN= aac.4 \ vr.4 \ vt.4 \ vte.4 \ - ${_vtnet.4} \ + vtnet.4 \ watchdog.4 \ ${_wbwd.4} \ witness.4 \ @@ -764,7 +764,7 @@ MLINKS+=vxlan.4 if_vxlan.4 MLINKS+=${_vmx.4} ${_if_vmx.4} MLINKS+=vr.4 if_vr.4 MLINKS+=vte.4 if_vte.4 -MLINKS+=${_vtnet.4} ${_if_vtnet.4} +MLINKS+=vtnet.4 if_vtnet.4 MLINKS+=watchdog.4 SW_WATCHDOG.4 MLINKS+=${_wpi.4} ${_if_wpi.4} MLINKS+=xl.4 if_xl.4 @@ -818,7 +818,6 @@ _if_ndis.4= if_ndis.4 _if_nfe.4= if_nfe.4 _if_urtw.4= if_urtw.4 _if_vmx.4= if_vmx.4 -_if_vtnet.4= if_vtnet.4 _if_wpi.4= if_wpi.4 _imcsmb.4= imcsmb.4 _ipmi.4= ipmi.4 @@ -849,15 +848,8 @@ _superio.4= superio.4 _tpm.4= tpm.4 _urtw.4= urtw.4 _viawd.4= viawd.4 -_virtio.4= virtio.4 -_virtio_balloon.4=virtio_balloon.4 -_virtio_blk.4= virtio_blk.4 -_virtio_console.4=virtio_console.4 -_virtio_random.4= virtio_random.4 -_virtio_scsi.4= virtio_scsi.4 _vmci.4= vmci.4 _vmx.4= vmx.4 -_vtnet.4= vtnet.4 _wbwd.4= wbwd.4 _wpi.4= wpi.4 _xen.4= xen.4 @@ -895,16 +887,8 @@ _nvram2env.4= nvram2env.4 .endif .if ${MACHINE_CPUARCH} == "powerpc" -_if_vtnet.4= if_vtnet.4 _nvd.4= nvd.4 _nvme.4= nvme.4 -_virtio.4= virtio.4 -_virtio_balloon.4=virtio_balloon.4 -_virtio_blk.4= virtio_blk.4 -_virtio_console.4=virtio_console.4 -_virtio_random.4= virtio_random.4 -_virtio_scsi.4= virtio_scsi.4 -_vtnet.4= vtnet.4 .endif .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" || \ diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 320f4002f817..f5dd13527f08 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -376,7 +376,7 @@ SUBDIR= \ unionfs \ usb \ ${_vesa} \ - ${_virtio} \ + virtio \ vge \ ${_viawd} \ videomode \ @@ -722,7 +722,6 @@ _tpm= tpm _twa= twa _vesa= vesa _viawd= viawd -_virtio= virtio _wpi= wpi .if ${MK_SOURCELESS_UCODE} != "no" _wpifw= wpifw @@ -794,7 +793,6 @@ _ffec= ffec _nvd= nvd _nvme= nvme _pccard= pccard -_virtio= virtio .endif .if ${MACHINE_ARCH:Mpowerpc64*} != ""