Attachment 226870 Details for Bug 257549 – Fix

[patch] Fix

0001-xen-timer-fix-amd64-LINT-kernel-build.patch (text/plain), 3.27 KB, created by Roger Pau Monné on 2021-08-02 08:44:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roger Pau Monné

Created: 2021-08-02 08:44:32 UTC

Size: 3.27 KB

patch

obsolete

>From 82bf6a2566ba51f2516c16aa7cca6398972c3123 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <royger@FreeBSD.org>
>Date: Mon, 2 Aug 2021 10:22:22 +0200
>Subject: [PATCH] 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
>-- 
>2.31.1
>

Actions: View | Diff

Attachments on bug 257549: 226870