From 32cb85d0f1e806ac2147fefff6b6e3bd107ba4c1 Mon Sep 17 00:00:00 2001
From: Jessica Clarke <jrtc27@FreeBSD.org>
Date: Thu, 21 Jan 2021 01:21:35 +0000
Subject: [PATCH] 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*} != ""