From de5ce1e3921e86b7b8176d85eaa3263aadba637d Mon Sep 17 00:00:00 2001 From: George Dunlap Date: Wed, 13 Nov 2013 09:25:36 +0100 Subject: [PATCH] VMX: allow vmx_update_debug_state to be called when v!=current Removing the assert allows the PVH code to call this during vmcs construction in a later patch, making the code more robust by removing duplicate code. Signed-off-by: George Dunlap Acked-by: Tim Deegan Reviewed-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Eddie Dong --- xen/arch/x86/hvm/vmx/vmx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 8e418c5f1e..8d451d449a 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1125,8 +1125,6 @@ void vmx_update_debug_state(struct vcpu *v) { unsigned long mask; - ASSERT(v == current); - mask = 1u << TRAP_int3; if ( !cpu_has_monitor_trap_flag ) mask |= 1u << TRAP_debug; @@ -1135,7 +1133,10 @@ void vmx_update_debug_state(struct vcpu *v) v->arch.hvm_vmx.exception_bitmap |= mask; else v->arch.hvm_vmx.exception_bitmap &= ~mask; + + vmx_vmcs_enter(v); vmx_update_exception_bitmap(v); + vmx_vmcs_exit(v); } static void vmx_update_guest_cr(struct vcpu *v, unsigned int cr) -- 2.30.2