D55429.diff
No OneTemporary
Actions

Size

684 B

Referenced Files

None

Subscribers

None

D55429.diff
View Options

	diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c
	--- a/sys/x86/x86/msi.c
	+++ b/sys/x86/x86/msi.c
	@@ -60,6 +60,7 @@
	#include <machine/specialreg.h>
	#include <dev/pci/pcivar.h>
	#include <x86/kvm.h>
	+#include <contrib/xen/arch-x86/cpuid.h>

	/* Fields in address for Intel MSI messages. */
	#define MSI_INTEL_ADDR_DEST 0x000ff000
	@@ -394,6 +395,12 @@

	/* Check if we support extended destination IDs. */
	switch (vm_guest) {
	+ case VM_GUEST_XEN:
	+ cpuid_count(hv_base + 4, 0, regs);
	+ if ((ext_dest_id == -1) &&
	+ (regs[0] & XEN_HVM_CPUID_EXT_DEST_ID))
	+ ext_dest_id = 1;
	+ break;
	case VM_GUEST_KVM:
	kvm_cpuid_get_features(regs);
	if ((ext_dest_id == -1) &&