Correctly restore guest_interruptibility when handling dbexception

lxylxy123456 · Oct 23, 2022 · 5252675 · 5252675
1 parent 6792c4c
commit 5252675
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/xmhf/src/xmhf-core/xmhf-runtime/xmhf-smpguest/arch/x86/vmx/smpg-x86vmx.c b/xmhf/src/xmhf-core/xmhf-runtime/xmhf-smpguest/arch/x86/vmx/smpg-x86vmx.c
@@ -409,7 +409,8 @@ void xmhf_smpguest_arch_x86vmx_eventhandler_dbexception(VCPU *vcpu, struct regs
   vcpu->vmcs.guest_RFLAGS |= g_vmx_lapic_guest_eflags_tfifmask;
 
   //restore NMI blocking (likely enable NMIs)
-  vcpu->vmcs.guest_interruptibility |= g_vmx_lapic_guest_intr_nmimask;
+  vcpu->vmcs.guest_interruptibility =
+    (vcpu->vmcs.guest_interruptibility & (1U << 3)) | g_vmx_lapic_guest_intr_nmimask;
 
   //restore exception bitmap
   vcpu->vmcs.control_exception_bitmap = g_vmx_lapic_exception_bitmap;