Module Name: src
Committed By: riastradh
Date: Tue Jul 16 12:01:19 UTC 2024
Modified Files:
src/sys/arch/alpha/conf: GENERIC.QEMU
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/evbarm/conf: GENERIC GENERIC64
src/sys/arch/evbmips/conf: MIPSSIM
src/sys/arch/i386/conf: ALL GENERIC
src/sys/arch/riscv/conf: GENERIC.common
src/sys/arch/sparc64/conf: GENERIC
src/sys/arch/virt68k/conf: GENERIC
Log Message:
viocon(4): Add to various kernel configs.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/conf/GENERIC.QEMU
cvs rdiff -u -r1.188 -r1.189 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.612 -r1.613 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/evbarm/conf/GENERIC
cvs rdiff -u -r1.217 -r1.218 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbmips/conf/MIPSSIM
cvs rdiff -u -r1.519 -r1.520 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1256 -r1.1257 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/riscv/conf/GENERIC.common
cvs rdiff -u -r1.240 -r1.241 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/virt68k/conf/GENERIC
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.2 src/sys/arch/alpha/conf/GENERIC.QEMU:1.3
--- src/sys/arch/alpha/conf/GENERIC.QEMU:1.2 Sun Nov 19 20:01:48 2023
+++ src/sys/arch/alpha/conf/GENERIC.QEMU Tue Jul 16 12:01:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.QEMU,v 1.2 2023/11/19 20:01:48 thorpej Exp $
+# $NetBSD: GENERIC.QEMU,v 1.3 2024/07/16 12:01:18 riastradh Exp $
#
# Generic Alpha kernel specifically configured for Qemu.
@@ -13,6 +13,7 @@ makeoptions COPY_SYMTAB=1
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
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.188 src/sys/arch/amd64/conf/ALL:1.189
--- src/sys/arch/amd64/conf/ALL:1.188 Tue Apr 30 19:35:29 2024
+++ src/sys/arch/amd64/conf/ALL Tue Jul 16 12:01:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.188 2024/04/30 19:35:29 andvar Exp $
+# $NetBSD: ALL,v 1.189 2024/07/16 12:01:18 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.188 $"
+#ident "ALL-$Revision: 1.189 $"
maxusers 64 # estimated number of users
@@ -1590,11 +1590,11 @@ weasel* at pci?
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
-viocon* at virtio? # Virtio console device
# 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.612 src/sys/arch/amd64/conf/GENERIC:1.613
--- src/sys/arch/amd64/conf/GENERIC:1.612 Tue Apr 30 19:35:29 2024
+++ src/sys/arch/amd64/conf/GENERIC Tue Jul 16 12:01:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.612 2024/04/30 19:35:29 andvar Exp $
+# $NetBSD: GENERIC,v 1.613 2024/07/16 12:01:18 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.612 $"
+#ident "GENERIC-$Revision: 1.613 $"
maxusers 64 # estimated number of users
@@ -1128,6 +1128,7 @@ weasel* at pci?
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
Index: src/sys/arch/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.120 src/sys/arch/evbarm/conf/GENERIC:1.121
--- src/sys/arch/evbarm/conf/GENERIC:1.120 Sat Jul 15 22:30:19 2023
+++ src/sys/arch/evbarm/conf/GENERIC Tue Jul 16 12:01:19 2024
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.120 2023/07/15 22:30:19 riastradh Exp $
+# $NetBSD: GENERIC,v 1.121 2024/07/16 12:01:19 riastradh Exp $
#
# GENERIC ARM (aarch32) kernel
#
@@ -602,6 +602,7 @@ virtio* at pci? dev ? function ? # Virt
# 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
Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.217 src/sys/arch/evbarm/conf/GENERIC64:1.218
--- src/sys/arch/evbarm/conf/GENERIC64:1.217 Sun Jun 30 09:39:05 2024
+++ src/sys/arch/evbarm/conf/GENERIC64 Tue Jul 16 12:01:19 2024
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.217 2024/06/30 09:39:05 jmcneill Exp $
+# $NetBSD: GENERIC64,v 1.218 2024/07/16 12:01:19 riastradh Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -564,6 +564,7 @@ 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
Index: src/sys/arch/evbmips/conf/MIPSSIM
diff -u src/sys/arch/evbmips/conf/MIPSSIM:1.10 src/sys/arch/evbmips/conf/MIPSSIM:1.11
--- src/sys/arch/evbmips/conf/MIPSSIM:1.10 Sat Jul 13 03:40:38 2024
+++ src/sys/arch/evbmips/conf/MIPSSIM Tue Jul 16 12:01:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: MIPSSIM,v 1.10 2024/07/13 03:40:38 rin Exp $
+# $NetBSD: MIPSSIM,v 1.11 2024/07/16 12:01:19 riastradh Exp $
#
# Kernel config for the QEMU MIPS "mipssim" simulator
#
@@ -8,7 +8,7 @@
include "arch/evbmips/conf/std.mipssim"
-#ident "GENERIC-$Revision: 1.10 $"
+#ident "GENERIC-$Revision: 1.11 $"
maxusers 32
@@ -123,6 +123,7 @@ com* at mainbus?
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
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.519 src/sys/arch/i386/conf/ALL:1.520
--- src/sys/arch/i386/conf/ALL:1.519 Tue Apr 30 19:35:28 2024
+++ src/sys/arch/i386/conf/ALL Tue Jul 16 12:01:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.519 2024/04/30 19:35:28 andvar Exp $
+# $NetBSD: ALL,v 1.520 2024/07/16 12:01:19 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.519 $"
+#ident "ALL-$Revision: 1.520 $"
maxusers 64 # estimated number of users
@@ -1705,11 +1705,11 @@ weasel* at pci?
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
-viocon* at virtio? # Virtio console device
# Flash subsystem
flash* at flashbus?
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1256 src/sys/arch/i386/conf/GENERIC:1.1257
--- src/sys/arch/i386/conf/GENERIC:1.1256 Tue Apr 30 19:35:28 2024
+++ src/sys/arch/i386/conf/GENERIC Tue Jul 16 12:01:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1256 2024/04/30 19:35:28 andvar Exp $
+# $NetBSD: GENERIC,v 1.1257 2024/07/16 12:01:19 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.1256 $"
+#ident "GENERIC-$Revision: 1.1257 $"
maxusers 64 # estimated number of users
@@ -1409,6 +1409,7 @@ weasel* at pci?
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
Index: src/sys/arch/riscv/conf/GENERIC.common
diff -u src/sys/arch/riscv/conf/GENERIC.common:1.14 src/sys/arch/riscv/conf/GENERIC.common:1.15
--- src/sys/arch/riscv/conf/GENERIC.common:1.14 Wed Apr 17 06:11:56 2024
+++ src/sys/arch/riscv/conf/GENERIC.common Tue Jul 16 12:01:19 2024
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.common,v 1.14 2024/04/17 06:11:56 skrll Exp $
+# $NetBSD: GENERIC.common,v 1.15 2024/07/16 12:01:19 riastradh Exp $
#
# GENERIC common RISC-V kernel config items shared between 32 and 64
# kernels
@@ -161,6 +161,7 @@ pseudo-device sequencer # MIDI sequenc
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
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.240 src/sys/arch/sparc64/conf/GENERIC:1.241
--- src/sys/arch/sparc64/conf/GENERIC:1.240 Tue Apr 2 22:56:51 2024
+++ src/sys/arch/sparc64/conf/GENERIC Tue Jul 16 12:01:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.240 2024/04/02 22:56:51 charlotte Exp $
+# $NetBSD: GENERIC,v 1.241 2024/07/16 12:01:19 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.240 $"
+#ident "GENERIC-$Revision: 1.241 $"
maxusers 64
@@ -409,6 +409,7 @@ virtio* at pci? dev ? function ? # Virti
# 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
Index: src/sys/arch/virt68k/conf/GENERIC
diff -u src/sys/arch/virt68k/conf/GENERIC:1.6 src/sys/arch/virt68k/conf/GENERIC:1.7
--- src/sys/arch/virt68k/conf/GENERIC:1.6 Fri Jan 19 05:47:15 2024
+++ src/sys/arch/virt68k/conf/GENERIC Tue Jul 16 12:01:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.6 2024/01/19 05:47:15 thorpej Exp $
+# $NetBSD: GENERIC,v 1.7 2024/07/16 12:01:19 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.6 $"
+#ident "GENERIC-$Revision: 1.7 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -162,6 +162,7 @@ virtctrl* at mainbus? addr ?
# VirtIO devices
virtio* at mainbus? addr ? # VirtIO nexus
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
