diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-05-19 20:50:07 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-05-19 20:50:07 +0100 |
| commit | 98ee48423ca62f8463adf8decc0914710f85f600 (patch) | |
| tree | ba567408c4b3600ada5e59459b890c55b9c4ca58 | |
| parent | 79e06e9be3c163235f8c388c8f831d72ca015b10 (diff) | |
| download | xen-98ee48423ca62f8463adf8decc0914710f85f600.tar.gz xen-98ee48423ca62f8463adf8decc0914710f85f600.tar.bz2 xen-98ee48423ca62f8463adf8decc0914710f85f600.zip | |
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@citrix.com>
xen-unstable changeset: 21435:c414129c8e12
xen-unstable date: Wed May 19 20:46:05 2010 +0100
| -rw-r--r-- | xen/arch/x86/hvm/vmx/vmcs.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 5e6ef6915d..108296ff97 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -558,6 +558,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); @@ -584,17 +586,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 ) { |