summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Larkin <mlarkin@cvs.openbsd.org>2018-04-26 10:43:59 +0000
committerMike Larkin <mlarkin@cvs.openbsd.org>2018-04-26 10:43:59 +0000
commit20b569330b321fe332a855630670202c226cbb27 (patch)
treed578c9d6107aba04476e1104cfcfbc1a00b4b6f3
parent70ddf8218d49c6153a70159a58caaa808a3a1e8d (diff)
vmm(4): ensure SVM_INTERCEPT_INTR is always enabled before entering
guest VM.
-rw-r--r--sys/arch/amd64/amd64/vmm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c
index 4d2fab267fd..44a75c478dc 100644
--- a/sys/arch/amd64/amd64/vmm.c
+++ b/sys/arch/amd64/amd64/vmm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmm.c,v 1.191 2018/04/25 16:22:19 mlarkin Exp $ */
+/* $OpenBSD: vmm.c,v 1.192 2018/04/26 10:43:58 mlarkin Exp $ */
/*
* Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
*
@@ -6169,6 +6169,7 @@ vcpu_run_svm(struct vcpu *vcpu, struct vm_run_params *vrp)
} else
fxrstor(&vcpu->vc_g_fpu.fp_fxsave);
+ KASSERT(vmcb->v_intercept1 & SVM_INTERCEPT_INTR);
KERNEL_UNLOCK();
wrmsr(MSR_AMD_VM_HSAVE_PA, vcpu->vc_svm_hsa_pa);