d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen/timer: fix amd64 LINT kernel build

Browse Source 
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: ae59812748 ('xen/timer: make xen timer optional')
This commit is contained in:
Roger Pau Monné 2021-08-02 10:22:22 +02:00
parent 9340ebd404
commit 82bf6a2566
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/conf/GENERIC
View File

@ -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

4
sys/amd64/conf/MINIMAL
View File

@ -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

1
sys/amd64/conf/NOTES
View File

@ -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
#####################################################################

1
sys/i386/conf/MINIMAL
View File

@ -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