[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] vmx: Do not modify global vmx_vm{entry, exit}_control fields in init_vmcs_config()
# HG changeset patch # User Keir Fraser <keir.fraser@xxxxxxxxxx> # Date 1274298365 -3600 # Node ID c414129c8e129422d03898ec5822f56b2d2da4f8 # Parent fe18437da295d0fdad2d852a603144eec62d29cd vmx: Do not modify global vmx_vm{entry,exit}_control fields in init_vmcs_config() The function shoudl only have single-domain effect. Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx> --- xen/arch/x86/hvm/vmx/vmcs.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff -r fe18437da295 -r c414129c8e12 xen/arch/x86/hvm/vmx/vmcs.c --- a/xen/arch/x86/hvm/vmx/vmcs.c Wed May 19 18:41:15 2010 +0100 +++ b/xen/arch/x86/hvm/vmx/vmcs.c Wed May 19 20:46:05 2010 +0100 @@ -636,6 +636,8 @@ static int construct_vmcs(struct vcpu *v struct domain *d = v->domain; uint16_t sysenter_cs; unsigned long sysenter_eip; + u32 vmexit_ctl = vmx_vmexit_control; + u32 vmentry_ctl = vmx_vmentry_control; vmx_vmcs_enter(v); @@ -662,17 +664,17 @@ static int construct_vmcs(struct vcpu *v v->arch.hvm_vmx.secondary_exec_control &= ~(SECONDARY_EXEC_ENABLE_EPT | SECONDARY_EXEC_UNRESTRICTED_GUEST); - vmx_vmexit_control &= ~(VM_EXIT_SAVE_GUEST_PAT | - VM_EXIT_LOAD_HOST_PAT); - vmx_vmentry_control &= ~VM_ENTRY_LOAD_GUEST_PAT; + vmexit_ctl &= ~(VM_EXIT_SAVE_GUEST_PAT | + VM_EXIT_LOAD_HOST_PAT); + vmentry_ctl &= ~VM_ENTRY_LOAD_GUEST_PAT; } /* Do not enable Monitor Trap Flag unless start single step debug */ v->arch.hvm_vmx.exec_control &= ~CPU_BASED_MONITOR_TRAP_FLAG; __vmwrite(CPU_BASED_VM_EXEC_CONTROL, v->arch.hvm_vmx.exec_control); - __vmwrite(VM_EXIT_CONTROLS, vmx_vmexit_control); - __vmwrite(VM_ENTRY_CONTROLS, vmx_vmentry_control); + __vmwrite(VM_EXIT_CONTROLS, vmexit_ctl); + __vmwrite(VM_ENTRY_CONTROLS, vmentry_ctl); if ( cpu_has_vmx_ple ) { _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |