From mboxrd@z Thu Jan 1 00:00:00 1970 From: George Dunlap Subject: [PATCH v15 01/19] Allow vmx_update_debug_state to be called when v!=current Date: Mon, 11 Nov 2013 14:57:03 +0000 Message-ID: <1384181841-22739-2-git-send-email-george.dunlap@eu.citrix.com> References: <1384181841-22739-1-git-send-email-george.dunlap@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1384181841-22739-1-git-send-email-george.dunlap@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Keir Fraser , Jan Beulich , George Dunlap , Eddie Dong , Tim Deegan , Jun Nakajima List-Id: xen-devel@lists.xenproject.org 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 ---- v13: Add vmx_vmcs_{enter,exit} CC: Mukesh Rathor CC: Jan Beulich CC: Tim Deegan CC: Keir Fraser CC: Jun Nakajima CC: 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 a0ad37a..f4e5bcb 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1104,8 +1104,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; @@ -1114,7 +1112,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) -- 1.7.9.5