Page MenuHomeFreeBSD
Files F169849669

D57729.id.diff
No OneTemporary
Actions

D57729.id.diff
View Options

diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -91,6 +91,18 @@
options IOMMU
device pci
+# ATA controllers
+device ahci # AHCI-compatible SATA controllers
+
+# ATA/SCSI peripherals
+device scbus # SCSI bus (required for ATA/SCSI)
+device da # Direct Access (disks)
+device cd # CD
+device pass # Passthrough device (direct ATA/SCSI access)
+
+# NVM Express (NVMe) support
+device nvme # base NVMe driver
+
# atkbdc0 controls both the keyboard and the PS/2 mouse
device atkbdc # AT keyboard controller
device atkbd # AT keyboard
@@ -138,8 +150,8 @@
device virtio_pci # VirtIO PCI device
device vtnet # VirtIO Ethernet device
device virtio_blk # VirtIO Block device
-device virtio_balloon # VirtIO Memory Balloon device
device virtio_scsi # VirtIO SCSI device
+device virtio_balloon # VirtIO Memory Balloon device
# Linux KVM paravirtualization support
device kvm_clock # KVM paravirtual clock driver
@@ -156,15 +168,3 @@
options EVDEV_SUPPORT # evdev support in legacy drivers
device evdev # input event device support
device uinput # install /dev/uinput cdev
-
-# NVM Express (NVMe) support
-device nvme # base NVMe driver
-
-# ATA controllers
-device ahci # AHCI-compatible SATA controllers
-
-# CAM
-device scbus # SCSI bus (required for ATA/SCSI)
-device da # Direct Access (disks)
-device cd # CD
-device pass # Passthrough device (direct ATA/SCSI access)
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -79,6 +79,7 @@
options CAPABILITY_MODE # Capsicum capability mode
options CAPABILITIES # Capsicum capabilities
options MAC # TrustedBSD MAC Framework
+options KDTRACE_FRAME # Ensure frames are compiled in
options KDTRACE_HOOKS # Kernel DTrace hooks
options DDB_CTF # Kernel ELF linker loads CTF data
options INCLUDE_CONFIG_FILE # Include this file in kernel
diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL
--- a/sys/i386/conf/MINIMAL
+++ b/sys/i386/conf/MINIMAL
@@ -90,9 +90,9 @@
options GZIO # gzip (dumps)
options ZSTDIO # zstd (dumps, tarfs, uzip, zfs)
-# Make an SMP-capable kernel by default
+# To make an SMP kernel, the next two lines are needed
options SMP # Symmetric MultiProcessor Kernel
-device apic
+device apic # I/O APIC
# CPU frequency control
device cpufreq
@@ -102,6 +102,18 @@
device smbios
device pci
+# ATA controllers
+device ahci # AHCI-compatible SATA controllers
+
+# ATA/SCSI peripherals
+device scbus # SCSI bus (required for ATA/SCSI)
+device da # Direct Access (disks)
+device cd # CD
+device pass # Passthrough device (direct ATA/SCSI access)
+
+# NVM Express (NVMe) support
+device nvme # base NVMe driver
+
# atkbdc0 controls both the keyboard and the PS/2 mouse
device atkbdc # AT keyboard controller
device atkbd # AT keyboard
@@ -141,15 +153,15 @@
device virtio_pci # VirtIO PCI device
device vtnet # VirtIO Ethernet device
device virtio_blk # VirtIO Block device
-device virtio_balloon # VirtIO Memory Balloon device
device virtio_scsi # VirtIO SCSI 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 and xentimer.
-# They must be added or removed together.
+# NOTE: XENHVM and xenpci interdepend. They must be added or removed
+# together. xentimer depends on XENHVM and isn't required.
options XENHVM # Xen HVM kernel infrastructure
device xenpci # Xen HVM Hypervisor services driver
device xentimer # Xen x86 PV timer device
@@ -158,15 +170,3 @@
options EVDEV_SUPPORT # evdev support in legacy drivers
device evdev # input event device support
device uinput # install /dev/uinput cdev
-
-# NVM Express (NVMe) support
-device nvme # base NVMe driver
-
-# ATA controllers
-device ahci # AHCI-compatible SATA controllers
-
-# CAM
-device scbus # SCSI bus (required for ATA/SCSI)
-device da # Direct Access (disks)
-device cd # CD
-device pass # Passthrough device (direct ATA/SCSI access)

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 3, 6:21 PM (18 m, 27 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38024602
Default Alt Text
D57729.id.diff (4 KB)

Event Timeline