D55431.diff
No OneTemporary
Actions

Size

615 B

Referenced Files

None

Subscribers

None

D55431.diff
View Options

	diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c
	--- a/sys/x86/x86/local_apic.c
	+++ b/sys/x86/x86/local_apic.c
	@@ -74,6 +74,7 @@
	#include <x86/init.h>
	#include <x86/kvm.h>
	#include <contrib/xen/arch-x86/cpuid.h>
	+#include <x86/bhyve.h>

	#ifdef DDB
	#include <sys/interrupt.h>
	@@ -2111,6 +2112,13 @@
	if (regs[0] & KVM_FEATURE_MSI_EXT_DEST_ID)
	apic_ext_dest_id = 1;
	break;
	+ case VM_GUEST_BHYVE:
	+ if (hv_high < CPUID_BHYVE_FEATURES)
	+ break;
	+ cpuid_count(CPUID_BHYVE_FEATURES, 0, regs);
	+ if (regs[0] & CPUID_BHYVE_FEAT_EXT_DEST_ID)
	+ apic_ext_dest_id = 1;
	+ break;
	}
	}