Module Name:    src
Committed By:   riastradh
Date:           Thu Mar 27 12:22:44 UTC 2025

Modified Files:
        src/sys/arch/alpha/conf: GENERIC.QEMU
        src/sys/arch/amd64/conf: ALL GENERIC MICROVM
        src/sys/arch/evbarm/conf: GENERIC GENERIC64
        src/sys/arch/evbmips/conf: MIPSSIM
        src/sys/arch/hppa/conf: GENERIC
        src/sys/arch/i386/conf: ALL GENERIC MICROVM
        src/sys/arch/riscv/conf: GENERIC.common
        src/sys/arch/sparc64/conf: GENERIC
        src/sys/arch/virt68k/conf: GENERIC
Added Files:
        src/sys/dev/virtio: virtio.config

Log Message:
virtio(4): Consolidate kernel configs.

No functional change intended.

Leave `# XXX ?' comments where I don't know why the driver in
question is excluded.  (Typical reason is that PAGE_SIZE is not 4096
but I didn't investigate -- if you do investigate, please either
update the comment if you determine a reason, or enable the driver if
you don't.)

PR kern/59211: vio9p(4): missing from various GENERICs and MAKEDEVs


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/conf/GENERIC.QEMU
cvs rdiff -u -r1.190 -r1.191 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.614 -r1.615 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/conf/MICROVM
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/evbarm/conf/GENERIC
cvs rdiff -u -r1.222 -r1.223 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbmips/conf/MIPSSIM
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/hppa/conf/GENERIC
cvs rdiff -u -r1.521 -r1.522 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1258 -r1.1259 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/conf/MICROVM
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/riscv/conf/GENERIC.common
cvs rdiff -u -r1.242 -r1.243 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/virt68k/conf/GENERIC
cvs rdiff -u -r0 -r1.1 src/sys/dev/virtio/virtio.config

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/alpha/conf/GENERIC.QEMU
diff -u src/sys/arch/alpha/conf/GENERIC.QEMU:1.3 src/sys/arch/alpha/conf/GENERIC.QEMU:1.4
--- src/sys/arch/alpha/conf/GENERIC.QEMU:1.3	Tue Jul 16 12:01:18 2024
+++ src/sys/arch/alpha/conf/GENERIC.QEMU	Thu Mar 27 12:22:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.QEMU,v 1.3 2024/07/16 12:01:18 riastradh Exp $
+# $NetBSD: GENERIC.QEMU,v 1.4 2025/03/27 12:22:43 riastradh Exp $
 #
 # Generic Alpha kernel specifically configured for Qemu.
 
@@ -11,10 +11,7 @@ makeoptions	COPY_SYMTAB=1
 
 # Virtio devices
 virtio*	at pci? dev ? function ?	# Virtio PCI device
-#viomb*	at virtio?			# Virtio memory balloon device
-ld*	at virtio?			# Virtio disk device
-viocon*	at virtio?			# Virtio serial device
-vioif*	at virtio?			# Virtio network device
-viornd*	at virtio?			# Virtio entropy device
-vioscsi* at virtio?			# Virtio SCSI device
-#vio9p*	at virtio?			# Virtio 9P device
+
+include "dev/virtio/virtio.config"
+no vio9p* 	at virtio?	# PAGE_SIZE != VIRTIO_PAGE_SIZE
+no viomb* 	at virtio?	# PAGE_SIZE != VIRTIO_PAGE_SIZE

Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.190 src/sys/arch/amd64/conf/ALL:1.191
--- src/sys/arch/amd64/conf/ALL:1.190	Mon Aug 26 13:38:28 2024
+++ src/sys/arch/amd64/conf/ALL	Thu Mar 27 12:22:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.190 2024/08/26 13:38:28 riastradh Exp $
+# $NetBSD: ALL,v 1.191 2025/03/27 12:22:43 riastradh Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.190 $"
+#ident		"ALL-$Revision: 1.191 $"
 
 maxusers	64		# estimated number of users
 
@@ -1589,13 +1589,8 @@ weasel* at pci?
 
 # Virtio devices
 virtio* at pci? dev ? function ?	# Virtio PCI device
-viomb*	at virtio?			# Virtio memory balloon device
-ld*	at virtio?			# Virtio disk device
-viocon* at virtio?			# Virtio console device
-vioif*	at virtio?			# Virtio network device
-viornd* at virtio?			# Virtio entropy device
-vioscsi* at virtio?			# Virtio SCSI device
-vio9p*	at virtio?			# Virtio 9P device
+
+include "dev/virtio/virtio.config"
 
 # Hyper-V devices
 vmbus*		at acpi?		# Hyper-V VMBus

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.614 src/sys/arch/amd64/conf/GENERIC:1.615
--- src/sys/arch/amd64/conf/GENERIC:1.614	Tue Aug 27 00:56:16 2024
+++ src/sys/arch/amd64/conf/GENERIC	Thu Mar 27 12:22:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.614 2024/08/27 00:56:16 riastradh Exp $
+# $NetBSD: GENERIC,v 1.615 2025/03/27 12:22:43 riastradh Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.614 $"
+#ident		"GENERIC-$Revision: 1.615 $"
 
 maxusers	64		# estimated number of users
 
@@ -1127,13 +1127,9 @@ weasel* at pci?
 
 # Virtio devices
 virtio* at pci? dev ? function ?	# Virtio PCI device
-viomb*	at virtio?			# Virtio memory balloon device
-ld*	at virtio?			# Virtio disk device
-viocon* at virtio?			# Virtio serial device
-vioif*	at virtio?			# Virtio network device
-viornd* at virtio?			# Virtio entropy device
-vioscsi* at virtio?			# Virtio SCSI device
-#vio9p*	at virtio?			# Virtio 9P device
+
+include "dev/virtio/virtio.config"
+no vio9p* 	at virtio?		# XXX ?
 
 # Hyper-V devices
 vmbus*		at acpi?		# Hyper-V VMBus

Index: src/sys/arch/amd64/conf/MICROVM
diff -u src/sys/arch/amd64/conf/MICROVM:1.1 src/sys/arch/amd64/conf/MICROVM:1.2
--- src/sys/arch/amd64/conf/MICROVM:1.1	Wed Jan 15 13:16:22 2025
+++ src/sys/arch/amd64/conf/MICROVM	Thu Mar 27 12:22:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: MICROVM,v 1.1 2025/01/15 13:16:22 imil Exp $
+# $NetBSD: MICROVM,v 1.2 2025/03/27 12:22:43 riastradh Exp $
 #
 # MICROVM kernel configuration, for use with Qemu microvm machine type
 # or Firecracker.
@@ -112,16 +112,10 @@ pv* at pvbus?
 virtio* at pv?
 #virtio* at acpi?
 #virtio* at pci? dev ? function ?	# Virtio PCI device
-#viomb*	at virtio?			# Virtio memory balloon device
 
-ld*	at virtio?			# Virtio disk device
-vioif*	at virtio?			# Virtio network device
-viornd* at virtio?			# Virtio entropy device
-viocon* at virtio?
-
-vio9p*	at virtio?			# Virtio 9P device
-#vioscsi* at virtio?
-#scsibus* at vioscsi?
+include "dev/virtio/virtio.config"
+no viomb* at virtio?			# XXX ?
+no vioscsi* at virtio?			# XXX ?
 
 pseudo-device	md			# memory disk device (ramdisk)
 #options 	MEMORY_DISK_HOOKS	# enable md specific hooks

Index: src/sys/arch/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.121 src/sys/arch/evbarm/conf/GENERIC:1.122
--- src/sys/arch/evbarm/conf/GENERIC:1.121	Tue Jul 16 12:01:19 2024
+++ src/sys/arch/evbarm/conf/GENERIC	Thu Mar 27 12:22:43 2025
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC,v 1.121 2024/07/16 12:01:19 riastradh Exp $
+#	$NetBSD: GENERIC,v 1.122 2025/03/27 12:22:43 riastradh Exp $
 #
 #	GENERIC ARM (aarch32) kernel
 #
@@ -599,13 +599,10 @@ usb* 		at usbus?
 # Virtio devices
 virtio* 	at fdt?				# Virtio MMIO device
 virtio* 	at pci? dev ? function ?	# Virtio PCI device
-# the balloon driver cannot work on machines with non-4k pages
-#viomb* 	at virtio?			# Virtio memory balloon device
-ld* 		at virtio?			# Virtio disk device
-viocon*		at virtio?			# Virtio serial device
-vioif* 		at virtio?			# Virtio network device
-viornd* 	at virtio?			# Virtio entropy device
-vioscsi* 	at virtio?			# Virtio SCSI device
+
+include "dev/virtio/virtio.config"
+no vio9p* 	at virtio?	# PAGE_SIZE != VIRTIO_PAGE_SIZE
+no viomb* 	at virtio?	# PAGE_SIZE != VIRTIO_PAGE_SIZE
 
 # SCSI
 scsibus* at scsi?

Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.222 src/sys/arch/evbarm/conf/GENERIC64:1.223
--- src/sys/arch/evbarm/conf/GENERIC64:1.222	Mon Dec 30 12:31:09 2024
+++ src/sys/arch/evbarm/conf/GENERIC64	Thu Mar 27 12:22:43 2025
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC64,v 1.222 2024/12/30 12:31:09 jmcneill Exp $
+#	$NetBSD: GENERIC64,v 1.223 2025/03/27 12:22:43 riastradh Exp $
 #
 #	GENERIC ARM (aarch64) kernel
 #
@@ -579,12 +579,10 @@ pseudo-device	sequencer			# MIDI sequenc
 virtio* 	at fdt?			# Virtio MMIO device
 virtio* 	at acpi?
 virtio* 	at pci? dev ? function ?
-#viomb*		at virtio?		# Virtio memory balloon device
-ld*		at virtio?		# Virtio disk device
-viocon*		at virtio?		# Virtio serial device
-vioif*		at virtio?		# Virtio network device
-viornd* 	at virtio?		# Virtio entropy device
-vioscsi*	at virtio?		# Virtio SCSI device
+
+include "dev/virtio/virtio.config"
+no vio9p* 	at virtio?		# XXX ?
+no viomb* 	at virtio?		# XXX ?
 
 # SCSI controllers
 mpt*		at pci? dev ? function ?

Index: src/sys/arch/evbmips/conf/MIPSSIM
diff -u src/sys/arch/evbmips/conf/MIPSSIM:1.11 src/sys/arch/evbmips/conf/MIPSSIM:1.12
--- src/sys/arch/evbmips/conf/MIPSSIM:1.11	Tue Jul 16 12:01:19 2024
+++ src/sys/arch/evbmips/conf/MIPSSIM	Thu Mar 27 12:22:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: MIPSSIM,v 1.11 2024/07/16 12:01:19 riastradh Exp $
+# $NetBSD: MIPSSIM,v 1.12 2025/03/27 12:22:43 riastradh Exp $
 #
 # Kernel config for the QEMU MIPS "mipssim" simulator
 #
@@ -8,7 +8,7 @@
 
 include 	"arch/evbmips/conf/std.mipssim"
 
-#ident 		"GENERIC-$Revision: 1.11 $"
+#ident 		"GENERIC-$Revision: 1.12 $"
 
 maxusers	32
 
@@ -121,13 +121,10 @@ com*		at mainbus?
 
 # Virtio devices
 virtio*		at mainbus?		# Virtio PCI device
-#viomb*		at virtio?		# Virtio memory balloon device
-ld*		at virtio?		# Virtio disk device
-viocon*		at virtio?		# Virtio serial device
-vioif*		at virtio?		# Virtio network device
-viornd*		at virtio?		# Virtio entropy device
-vioscsi*	at virtio?		# Virtio SCSI device
-#vio9p*		at virtio?		# Virtio 9P device
+
+include "dev/virtio/virtio.config"
+no vio9p* 	at virtio?		# XXX ?
+no viomb* 	at virtio?		# XXX ?
 
 # SCSI bus support
 scsibus* at scsi?

Index: src/sys/arch/hppa/conf/GENERIC
diff -u src/sys/arch/hppa/conf/GENERIC:1.48 src/sys/arch/hppa/conf/GENERIC:1.49
--- src/sys/arch/hppa/conf/GENERIC:1.48	Mon Feb 10 14:05:07 2025
+++ src/sys/arch/hppa/conf/GENERIC	Thu Mar 27 12:22:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.48 2025/02/10 14:05:07 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.49 2025/03/27 12:22:43 riastradh Exp $
 #
 # GENERIC machine description file
 #
@@ -23,7 +23,7 @@ include 	"arch/hppa/conf/std.hppa"
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 
-#ident 		"GENERIC-$Revision: 1.48 $"
+#ident 		"GENERIC-$Revision: 1.49 $"
 
 maxusers	32		# estimated number of users
 
@@ -694,12 +694,11 @@ ucom*	at ugensa?
 
 # Virtio devices
 virtio* at pci? dev ? function ?	# Virtio PCI device
-#viomb*	at virtio?			# Virtio memory balloon device
-ld*	at virtio?			# Virtio disk device
-vioif*	at virtio?			# Virtio network device
-viornd* at virtio?			# Virtio entropy device
-vioscsi* at virtio?			# Virtio SCSI device
-#vio9p*	at virtio?			# Virtio 9P device
+
+include "dev/virtio/virtio.config"
+no vio9p* 	at virtio?		# XXX ?
+no viocon* 	at virtio?		# XXX ?
+no viomb* 	at virtio?		# XXX ?
 
 # Pseudo-Devices
 

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.521 src/sys/arch/i386/conf/ALL:1.522
--- src/sys/arch/i386/conf/ALL:1.521	Mon Aug 26 13:38:28 2024
+++ src/sys/arch/i386/conf/ALL	Thu Mar 27 12:22:44 2025
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.521 2024/08/26 13:38:28 riastradh Exp $
+# $NetBSD: ALL,v 1.522 2025/03/27 12:22:44 riastradh Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.521 $"
+#ident		"ALL-$Revision: 1.522 $"
 
 maxusers	64		# estimated number of users
 
@@ -1704,13 +1704,8 @@ weasel* at pci?
 
 # Virtio devices
 virtio*	at pci? dev ? function ?	# Virtio PCI device
-viomb*	at virtio?			# Virtio memory balloon device
-ld*	at virtio?			# Virtio disk device
-viocon* at virtio?			# Virtio serial device
-vioif*	at virtio?			# Virtio network device
-viornd* at virtio?			# Virtio entropy device
-vioscsi* at virtio?			# Virtio SCSI device
-vio9p*	at virtio?			# Virtio 9P device
+
+include "dev/virtio/virtio.config"
 
 # Flash subsystem
 flash* at flashbus?

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1258 src/sys/arch/i386/conf/GENERIC:1.1259
--- src/sys/arch/i386/conf/GENERIC:1.1258	Tue Aug 27 00:56:16 2024
+++ src/sys/arch/i386/conf/GENERIC	Thu Mar 27 12:22:44 2025
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1258 2024/08/27 00:56:16 riastradh Exp $
+# $NetBSD: GENERIC,v 1.1259 2025/03/27 12:22:44 riastradh Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.1258 $"
+#ident		"GENERIC-$Revision: 1.1259 $"
 
 maxusers	64		# estimated number of users
 
@@ -1408,13 +1408,9 @@ weasel* at pci?
 
 # Virtio devices
 virtio* at pci? dev ? function ?	# Virtio PCI device
-viomb* at virtio?			# Virtio memory balloon device
-ld* at virtio?				# Virtio disk device
-viocon* at virtio?			# Virtio serial device
-vioif* at virtio?			# Virtio network device
-viornd* at virtio?			# Virtio entropy device
-vioscsi* at virtio?			# Virtio SCSI device
-#vio9p*	at virtio?			# Virtio 9P device
+
+include "dev/virtio/virtio.config"
+no vio9p* at virtio?			# XXX ?
 
 # Hyper-V devices
 vmbus*		at acpi?		# Hyper-V VMBus

Index: src/sys/arch/i386/conf/MICROVM
diff -u src/sys/arch/i386/conf/MICROVM:1.1 src/sys/arch/i386/conf/MICROVM:1.2
--- src/sys/arch/i386/conf/MICROVM:1.1	Tue Feb 18 10:16:03 2025
+++ src/sys/arch/i386/conf/MICROVM	Thu Mar 27 12:22:44 2025
@@ -1,4 +1,4 @@
-# $NetBSD: MICROVM,v 1.1 2025/02/18 10:16:03 imil Exp $
+# $NetBSD: MICROVM,v 1.2 2025/03/27 12:22:44 riastradh Exp $
 #
 # MICROVM kernel configuration, for use with Qemu microvm machine type
 # or Firecracker.
@@ -112,16 +112,10 @@ pv* at pvbus?
 virtio* at pv?
 #virtio* at acpi?
 #virtio* at pci? dev ? function ?	# Virtio PCI device
-#viomb*	at virtio?			# Virtio memory balloon device
 
-ld*	at virtio?			# Virtio disk device
-vioif*	at virtio?			# Virtio network device
-viornd* at virtio?			# Virtio entropy device
-viocon* at virtio?
-
-vio9p*	at virtio?			# Virtio 9P device
-#vioscsi* at virtio?
-#scsibus* at vioscsi?
+include "dev/virtio/virtio.config"
+no viomb* at virtio?			# XXX ?
+no vioscsi* at virtio?			# XXX ?
 
 pseudo-device	md			# memory disk device (ramdisk)
 #options 	MEMORY_DISK_HOOKS	# enable md specific hooks

Index: src/sys/arch/riscv/conf/GENERIC.common
diff -u src/sys/arch/riscv/conf/GENERIC.common:1.20 src/sys/arch/riscv/conf/GENERIC.common:1.21
--- src/sys/arch/riscv/conf/GENERIC.common:1.20	Sat Feb  8 16:09:59 2025
+++ src/sys/arch/riscv/conf/GENERIC.common	Thu Mar 27 12:22:44 2025
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.common,v 1.20 2025/02/08 16:09:59 skrll Exp $
+#	$NetBSD: GENERIC.common,v 1.21 2025/03/27 12:22:44 riastradh Exp $
 #
 #	GENERIC common RISC-V kernel config items shared between 32 and 64
 #	kernels
@@ -177,12 +177,11 @@ iic* 		at i2cbus?
 
 # Virtio devices
 virtio* 	at fdt?			# Virtio MMIO device
-#viomb* 	at virtio?		# Virtio memory balloon device
-ld* 		at virtio?		# Virtio disk device
-viocon* 	at virtio?		# Virtio serial device
-vioif* 		at virtio?		# Virtio network device
-viornd* 	at virtio?		# Virtio entropy device
-#vioscsi* 	at virtio?		# Virtio SCSI device
+
+include "dev/virtio/virtio.config"
+no vio9p* 	at virtio?		# XXX ?
+no viomb* 	at virtio?		# XXX ?
+no vioscsi* 	at virtio?		# XXX ?
 
 # Pseudo-Devices
 # network pseudo-devices

Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.242 src/sys/arch/sparc64/conf/GENERIC:1.243
--- src/sys/arch/sparc64/conf/GENERIC:1.242	Mon Feb 24 21:32:26 2025
+++ src/sys/arch/sparc64/conf/GENERIC	Thu Mar 27 12:22:44 2025
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.242 2025/02/24 21:32:26 andvar Exp $
+# $NetBSD: GENERIC,v 1.243 2025/03/27 12:22:44 riastradh Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/sparc64/conf/std.sparc64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.242 $"
+#ident		"GENERIC-$Revision: 1.243 $"
 
 maxusers	64
 
@@ -406,13 +406,10 @@ ld*	at mlx? unit ?
 
 # Virtio devices
 virtio* at pci? dev ? function ?	# Virtio PCI device
-# the baloon driver can not work on machines with non-4k pages
-#viomb*	at virtio?			# Virtio memory balloon device
-ld*	at virtio?			# Virtio disk device
-viocon*	at virtio?			# Virtio serial device
-vioif*	at virtio?			# Virtio network device
-viornd* at virtio?			# Virtio entropy device
-vioscsi* at virtio?			# Virtio SCSI device
+
+include "dev/virtio/virtio.config"
+no vio9p* 	at virtio?	# PAGE_SIZE != VIRTIO_PAGE_SIZE
+no viomb* 	at virtio?	# PAGE_SIZE != VIRTIO_PAGE_SIZE
 
 ## Floppy controller and drive found on SPARCstations.
 

Index: src/sys/arch/virt68k/conf/GENERIC
diff -u src/sys/arch/virt68k/conf/GENERIC:1.9 src/sys/arch/virt68k/conf/GENERIC:1.10
--- src/sys/arch/virt68k/conf/GENERIC:1.9	Fri Nov  1 14:31:59 2024
+++ src/sys/arch/virt68k/conf/GENERIC	Thu Mar 27 12:22:44 2025
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.9 2024/11/01 14:31:59 mlelstv Exp $
+# $NetBSD: GENERIC,v 1.10 2025/03/27 12:22:44 riastradh Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/virt68k/conf/std.virt68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.9 $"
+#ident 		"GENERIC-$Revision: 1.10 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -174,11 +174,10 @@ virtctrl*	at mainbus? addr ?
 
 # VirtIO devices
 virtio*		at mainbus? addr ?	# VirtIO nexus
-ld*		at virtio?		# VirtIO disk device
-vioif*		at virtio?		# VirtIO network device
-viornd*		at virtio?		# VirtIO entropy device
-vioscsi*	at virtio?		# VirtIO SCSI device
-viocon*		at virtio?		# Virtio Console
+
+include "dev/virtio/virtio.config"
+no vio9p* 	at virtio?		# XXX ?
+no viomb* 	at virtio?		# XXX ?
 
 # SCSI devices
 scsibus* at scsi?

Added files:

Index: src/sys/dev/virtio/virtio.config
diff -u /dev/null src/sys/dev/virtio/virtio.config:1.1
--- /dev/null	Thu Mar 27 12:22:44 2025
+++ src/sys/dev/virtio/virtio.config	Thu Mar 27 12:22:44 2025
@@ -0,0 +1,20 @@
+#	$NetBSD: virtio.config,v 1.1 2025/03/27 12:22:44 riastradh Exp $
+#
+# This file contains all generally useful virtio(4) drivers.
+# It is suitable for inclusion in a kernel config(5) file which
+# provides any virtio(4) attachments, typically at pci, fdt, or acpi.
+#
+# Note: Certain drivers currently need PAGE_SIZE == VIRTIO_PAGE_SIZE:
+# - viomb
+# - vio9p
+# These may have to be disabled explicitly in users on architectures
+# where PAGE_SIZE != 4096.
+#
+
+viomb* 		at virtio?		# Virtio memory balloon device
+ld* 		at virtio?		# Virtio disk device
+viocon* 	at virtio?		# Virtio serial device
+vioif* 		at virtio?		# Virtio network device
+viornd* 	at virtio?		# Virtio entropy device
+vioscsi* 	at virtio?		# Virtio SCSI device
+vio9p* 		at virtio?		# Virtio 9P device

Reply via email to