The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=43d4680b399b34baa619dedbc747326000103136
commit 43d4680b399b34baa619dedbc747326000103136 Author: Dag-Erling Smørgrav <[email protected]> AuthorDate: 2023-02-09 17:24:08 +0000 Commit: Dag-Erling Smørgrav <[email protected]> CommitDate: 2023-02-09 17:24:45 +0000 MINIMAL: Update and clean up. * Add GEOM_LABEL, required to boot a default UEFI install. * Add enough of virtio to boot in bhyve. * Reduce diff between amd64 and i386. * Reduce diff to GENERIC. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D38468 --- sys/amd64/conf/MINIMAL | 13 ++++++++++--- sys/i386/conf/MINIMAL | 29 ++++++++++++++--------------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 62f942eef677..fdafeed46eef 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -52,6 +52,7 @@ options UFS_DIRHASH # Improve performance on big directories options UFS_GJOURNAL # Enable gjournal-based UFS journaling options QUOTA # Enable disk quotas for UFS options MD_ROOT # MD is a potential root device +options GEOM_LABEL # Provides labelization options COMPAT_FREEBSD32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 @@ -118,9 +119,8 @@ device vt_vbefb device agp # support several AGP chipsets -# Bring in 'uart' as well, since it can be a console driver and all console -# drivers must be compiled into the kernel. -device uart +# Serial (COM) ports +device uart # Generic UART driver # Pseudo devices. device loop # Network loopback @@ -133,6 +133,13 @@ device ether # Ethernet support # Note that 'bpf' is required for DHCP. device bpf # Berkeley packet filter +# 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_balloon # VirtIO Memory Balloon device + # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index d9d556048b76..d939201d85a9 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -53,6 +53,7 @@ options UFS_DIRHASH # Improve performance on big directories options UFS_GJOURNAL # Enable gjournal-based UFS journaling options QUOTA # Enable disk quotas for UFS options MD_ROOT # MD is a potential root device +options GEOM_LABEL # Provides labelization options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options COMPAT_FREEBSD6 # Compatible with FreeBSD6 @@ -84,16 +85,6 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel # Debugging support. Always need this: options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. -# For full debugger support use (turn off in stable branch): -options DDB # Support DDB. -options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver -options INVARIANTS # Enable calls of extra sanity checking -options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones -options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel @@ -129,28 +120,36 @@ device vt_vbefb device agp # support several AGP chipsets +# Serial (COM) ports +device uart # Generic UART driver + # Pseudo devices. device loop # Network loopback device padlock_rng # VIA Padlock RNG device rdrand_rng # Intel Bull Mountain RNG device ether # Ethernet support -device vlan # 802.1Q VLAN support -device tuntap # Packet tunnel. -device gif # IPv6 and IPv4 tunneling # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! # Note that 'bpf' is required for DHCP. device bpf # Berkeley packet filter +# 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_balloon # VirtIO Memory Balloon device + # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver # Xen HVM Guest Optimizations -# NOTE: XENHVM depends on xenpci. They must be added or removed together. +# NOTE: XENHVM depends on xenpci and xentimer. +# They must be added or removed together. options XENHVM # Xen HVM kernel infrastructure device xenpci # Xen HVM Hypervisor services driver -device xentimer # Xen x86 PV timer device +device xentimer # Xen x86 PV timer device # evdev interface options EVDEV_SUPPORT # evdev support in legacy drivers
