From e045163cce955c32332a02a8eb9a48f3c2cd3c3f Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Sat, 13 Apr 2024 19:10:44 -0700
Subject: [PATCH] i386: Use DEV_HYPERV to enable HyperV APIC vector

This avoids requiring both 'device hyperv' and 'options HYPERV' for
kernel configs.  Instead, just 'device hyperv' can now be used
matching the kernel configuration used for amd64.

Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D44783
---
 sys/conf/options.i386     | 2 +-
 sys/i386/conf/GENERIC     | 2 --
 sys/i386/conf/NOTES       | 1 -
 sys/i386/i386/exception.S | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index b98591a2a7da..c577568c837f 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -97,7 +97,7 @@ NPX_DEBUG		opt_npx.h
 BPF_JITTER		opt_bpf.h
 
 # Hyper-V support
-HYPERV			opt_hyperv.h
+DEV_HYPERV		opt_hyperv.h
 
 XENHVM			opt_global.h
 
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 461a21fe7b70..b5898ed94b81 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -327,8 +327,6 @@ device		virtio_balloon		# VirtIO Memory Balloon device
 device		kvm_clock		# KVM paravirtual clock driver
 
 # HyperV drivers and enhancement support
-# NOTE: HYPERV depends on hyperv.  They must be added or removed together.
-options 	HYPERV			# Kernel support for HyperV drivers
 device		hyperv			# HyperV drivers
 
 # Xen HVM Guest Optimizations
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index bab537ac1dfe..d421f2511478 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -660,7 +660,6 @@ device 		kvm_clock	# KVM paravirtual clock driver
 # Google Virtual NIC
 device		gve		# Google Virtual NIC (gVNIC) driver
 
-options 	HYPERV
 device		hyperv		# HyperV drivers
 device		hvhid		# HyperV HID device
 
diff --git a/sys/i386/i386/exception.S b/sys/i386/i386/exception.S
index 32456b63092b..a2a59db3c836 100644
--- a/sys/i386/i386/exception.S
+++ b/sys/i386/i386/exception.S
@@ -450,7 +450,7 @@ ENTRY(fork_trampoline)
 #include <i386/i386/apic_vector.S>
 #endif
 
-#ifdef HYPERV
+#ifdef DEV_HYPERV
 	.data
 	.p2align 4
 	.text