git: 1f678b6ba215 - main - NOTES: Move the VirtIO entries to the MI NOTES file

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=1f678b6ba215aad01a1610772c77af653a981601

commit 1f678b6ba215aad01a1610772c77af653a981601
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-04-14 02:10:27 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-04-14 02:10:27 +0000

    NOTES: Move the VirtIO entries to the MI NOTES file
    
    While here, add virtio_gpu
    
    Reviewed by:    imp, emaste
    Differential Revision:  https://reviews.freebsd.org/D44782
---
 sys/amd64/conf/NOTES | 18 ------------------
 sys/arm64/conf/NOTES |  8 --------
 sys/conf/NOTES       | 20 ++++++++++++++++++++
 sys/i386/conf/NOTES  | 18 ------------------
 sys/riscv/conf/NOTES |  8 --------
 5 files changed, 20 insertions(+), 52 deletions(-)

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 0cabacb45dd7..35154d7b634d 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -450,24 +450,6 @@ device		pmspcv
 # Only for legacy Atom C2XXX chipsets.
 device		qat_c2xxx
 
-#
-# VirtIO support
-#
-# The virtio entry provides a generic bus for use by the device drivers.
-# It must be combined with an interface that communicates with the host.
-# Multiple such interfaces are defined by the VirtIO specification. FreeBSD
-# only has support for PCI. Therefore, virtio_pci must be statically
-# compiled in or loaded as a module for the device drivers to function.
-#
-device		virtio		# Generic VirtIO bus (required)
-device		virtio_pci	# VirtIO PCI Interface
-device		vtnet		# VirtIO Ethernet device
-device		virtio_blk	# VirtIO Block device
-device		virtio_scsi	# VirtIO SCSI device
-device		virtio_balloon	# VirtIO Memory Balloon device
-device		virtio_random	# VirtIO Entropy device
-device		virtio_console	# VirtIO Console device
-
 # Linux KVM paravirtualization support
 device		kvm_clock	# KVM paravirtual clock driver
 
diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES
index d58bc5b82f89..3e8499c872b9 100644
--- a/sys/arm64/conf/NOTES
+++ b/sys/arm64/conf/NOTES
@@ -60,14 +60,6 @@ device		al_udma			# Universal DMA
 # Qualcomm Snapdragon drivers
 device		qcom_gcc		# Global Clock Controller
 
-# VirtIO support
-device		virtio
-device		virtio_pci
-device		virtio_mmio
-device		virtio_blk
-device		vtnet
-device		virtio_scmi
-
 # Google Virtual NIC
 device		gve		# Google Virtual NIC (gVNIC) driver
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 85cd1a307c14..cb28ddd00c20 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2409,6 +2409,26 @@ options 	NSFBUFS=1024
 #
 options 	DEBUG_LOCKS
 
+#
+# VirtIO support
+#
+# The virtio entry provides a generic bus for use by the device drivers.
+# It must be combined with an interface that communicates with the host.
+# Multiple such interfaces are defined by the VirtIO specification
+# including PCI and MMIO.
+#
+device		virtio		# Generic VirtIO bus (required)
+device		virtio_mmio	# VirtIO MMIO Interface
+device		virtio_pci	# VirtIO PCI Interface
+device		vtnet		# VirtIO Ethernet device
+device		virtio_balloon	# VirtIO Memory Balloon device
+device		virtio_blk	# VirtIO Block device
+device		virtio_console	# VirtIO Console device
+device		virtio_gpu	# VirtIO GPU device
+device		virtio_random	# VirtIO Entropy device
+device		virtio_scmi	# VirtIO SCSI device
+device		virtio_scsi	# VirtIO SCMI device
+
 #####################################################################
 # HID support
 device		hid		# Generic HID support
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index eee1424b2118..bab537ac1dfe 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -654,24 +654,6 @@ device		glxiic		# AMD Geode LX CS5536 System Management Bus
 #
 device		glxsb		# AMD Geode LX Security Block
 
-#
-# VirtIO support
-#
-# The virtio entry provides a generic bus for use by the device drivers.
-# It must be combined with an interface that communicates with the host.
-# Multiple such interfaces defined by the VirtIO specification. FreeBSD
-# only has support for PCI. Therefore, virtio_pci must be statically
-# compiled in or loaded as a module for the device drivers to function.
-#
-device		virtio		# Generic VirtIO bus (required)
-device		virtio_pci	# VirtIO PCI Interface
-device		vtnet		# VirtIO Ethernet device
-device		virtio_blk	# VirtIO Block device
-device		virtio_scsi	# VirtIO SCSI device
-device		virtio_balloon	# VirtIO Memory Balloon device
-device		virtio_random	# VirtIO Entropy device
-device		virtio_console	# VirtIO Console device
-
 # Linux KVM paravirtualization support
 device 		kvm_clock	# KVM paravirtual clock driver
 
diff --git a/sys/riscv/conf/NOTES b/sys/riscv/conf/NOTES
index d818fd0581c3..36d2e06fb698 100644
--- a/sys/riscv/conf/NOTES
+++ b/sys/riscv/conf/NOTES
@@ -32,14 +32,6 @@ device		riscv_syscon
 # Backlight subsystem
 device		backlight
 
-# VirtIO support
-device		virtio			# Generic VirtIO bus (required)
-device		virtio_pci		# VirtIO PCI device
-device		vtnet			# VirtIO Ethernet device
-device		virtio_blk		# VirtIO Block device
-device		virtio_mmio		# VirtIO MMIO bus
-device		virtio_random		# VirtIO Entropy device
-
 # MMC/SD/SDIO Card slot support
 device		dwmmc