From owner-dev-commits-src-main@freebsd.org Mon Aug 2 09:32:55 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EBEF967151A; Mon, 2 Aug 2021 09:32:55 +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 4GdXqC63h2z3PNv; Mon, 2 Aug 2021 09:32:55 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B82DF1D58F; Mon, 2 Aug 2021 09:32:55 +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 1729WtiX027663; Mon, 2 Aug 2021 09:32:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1729WtwJ027662; Mon, 2 Aug 2021 09:32:55 GMT (envelope-from git) Date: Mon, 2 Aug 2021 09:32:55 GMT Message-Id: <202108020932.1729WtwJ027662@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger Pau Monn=C3=A9?= Subject: git: 82bf6a2566ba - main - xen/timer: fix amd64 LINT kernel build MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82bf6a2566ba51f2516c16aa7cca6398972c3123 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Aug 2021 09:32:56 -0000 The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=82bf6a2566ba51f2516c16aa7cca6398972c3123 commit 82bf6a2566ba51f2516c16aa7cca6398972c3123 Author: Roger Pau Monné AuthorDate: 2021-08-02 08:22:22 +0000 Commit: Roger Pau Monné CommitDate: 2021-08-02 08:33:35 +0000 xen/timer: fix amd64 LINT kernel build On amd64 XENHVM depends on the xentimer device for PVH early startup, so both should be added or removed together (like the current dependency with xenpci). Fix this by adding xentimer to NOTES and updating the comments on the config files. Note that on i386 there's no such dependency between xentimer and XENHVM, since there's no PVH support. While there also fix the MINIMAL i386 build to include the xentimer, so it keeps the same functionality as before xentimer was split from XENHVM. Reported by: lwhsu PR: 257549 Fixes: ae5981274815 ('xen/timer: make xen timer optional') --- sys/amd64/conf/GENERIC | 4 ++-- sys/amd64/conf/MINIMAL | 4 +++- sys/amd64/conf/NOTES | 1 + sys/i386/conf/MINIMAL | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index fa531e13a3b9..f7b41919575d 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -380,8 +380,8 @@ device virtio_balloon # VirtIO Memory Balloon device device hyperv # HyperV drivers # Xen HVM Guest Optimizations -# NOTE: XENHVM and xenpci interdepend. They must be added or removed -# together. xentimer depends on XENHVM and isn't required. +# 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 diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 6678f0a7ee63..14f91e6c8eaf 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -132,9 +132,11 @@ device ether # Ethernet support device bpf # Berkeley packet filter # 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 # evdev interface options EVDEV_SUPPORT # evdev support in legacy drivers diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index f5bdf15ebb08..501ceaedb222 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -504,6 +504,7 @@ device hyperv # HyperV drivers # Xen HVM Guest Optimizations options XENHVM # Xen HVM kernel infrastructure device xenpci # Xen HVM Hypervisor services driver +device xentimer # Xen x86 PV timer device ##################################################################### diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index f80c5cf40b48..37b8e074ac65 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -149,6 +149,7 @@ device bpf # Berkeley packet filter # NOTE: XENHVM depends on xenpci. 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 # evdev interface options EVDEV_SUPPORT # evdev support in legacy drivers