From nobody Thu Feb 9 17:25:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PCNzP2JL1z3mwmt; Thu, 9 Feb 2023 17:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PCNzN4jcmz4Vxj; Thu, 9 Feb 2023 17:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675963504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SmR2XUffHVT/zo7o3FYqB8h6lGtfNKm2aNoxGMG9yRQ=; b=esC0jRhGHeWJa9KUn1u9elmmM3g3wyZ7O9pznJCwFN3h+eZsp/lFgAvbxpoh6/nzwKLjOk Wpqddo9k3OeHZiktHKbsRn9Uym8w5gS8pBwqOd5W01x+qlWszOdgga5FIsrWw5IdZMIf8q UE/7/RRPcxejDbH1vtl09X3mFcKrP7P7b5x2arSLrk+qtmmQZL8g8sEEM4hBCQgBl6Z3zR c17zWhSNLXWOhfT7/3D7Cdci9e95hCdBi0cJ+yF1GSZdYCauQj7JZiW82alyF5/vYZQrrP MxM86SrhHJSvjZJkYv6gbD+tA8DE9TDw2STqnd1X4+nAKl9AYVkGYGaTtBD5lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675963504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SmR2XUffHVT/zo7o3FYqB8h6lGtfNKm2aNoxGMG9yRQ=; b=SZLnDf/U4RU58Vwdi4f5hitrDNxYnB40M/64ZFdJcQBfkTImnlZ5fTq3GYMmw0wzPdCZj4 v05Us54t9zwfdQj4e26LbAW8OsRDq2FL6bxPCWQrMILS8o1x2BA0x2ClN8Q3JrPhG8Ig3q il0150MvMO3cJTcrSD48ZybQ/Y7A0CnHKLA0Wlyjqrca6CyrsimvXz78O35loODocV+8tE ty2ecc+unk84PuZHTxtuo8l01fkQF3r6A/AlLyKwNmq3K2+L/emDkZpc7TNDFtVEYKNM6q +jncZxHzv9V6v/iU6ay6gWhkW5x4TRCNicF2vGb9u4O49UqHw/j5RSVa1Qj6KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675963504; a=rsa-sha256; cv=none; b=xdrYhaKbEIANtrv+XmVfumfwaUr/f36/tpB5FkEwS1ELiTQGo4j9DwsAqox2aVyPj2fweF QIM65LJvTshWetef/joiCxGZswTPEpGG8PZb9iRdXD4vSh1BMcwZrFmVTn+hMRslK89GSr O9AnqvKaQyhHfWjtVMFhIfuKqj4JpF74KHVAmP7V8r4fR3DSMT1sbqX4SslkITb0sqCf9x NBdZzrqi23mNvq98vltA1c4TXUn9EyAbsh4PCzoanO4MuHKO2vUwNaMxxwkTNxb0Od+DiS rHaEdj51fQUHmMURYbfmqT8lg+eyTQsy/Yuv4NA0PHSnEPGbxglju2/0faH7sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PCNzN3mYTzlWn; Thu, 9 Feb 2023 17:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 319HP4md010670; Thu, 9 Feb 2023 17:25:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 319HP43P010669; Thu, 9 Feb 2023 17:25:04 GMT (envelope-from git) Date: Thu, 9 Feb 2023 17:25:04 GMT Message-Id: <202302091725.319HP43P010669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 43d4680b399b - main - MINIMAL: Update and clean up. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43d4680b399b34baa619dedbc747326000103136 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=43d4680b399b34baa619dedbc747326000103136 commit 43d4680b399b34baa619dedbc747326000103136 Author: Dag-Erling Smørgrav AuthorDate: 2023-02-09 17:24:08 +0000 Commit: Dag-Erling Smørgrav 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