WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-4.0-testing] vmx: Do not modify global vmx_vm{entry

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-4.0-testing] vmx: Do not modify global vmx_vm{entry, exit}_control fields in init_vmcs_config()
From: "Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 19 May 2010 12:55:23 -0700
Delivery-date: Wed, 19 May 2010 12:56:38 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1274298607 -3600
# Node ID a1b50472c2859b97f0185a9d2152e29d3d022b6e
# Parent  43661ec746246b68f3417e8ce367932185847f37
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-unstable changeset:   21435:c414129c8e12
xen-unstable date:        Wed May 19 20:46:05 2010 +0100
---
 xen/arch/x86/hvm/vmx/vmcs.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff -r 43661ec74624 -r a1b50472c285 xen/arch/x86/hvm/vmx/vmcs.c
--- a/xen/arch/x86/hvm/vmx/vmcs.c       Wed May 19 20:49:08 2010 +0100
+++ b/xen/arch/x86/hvm/vmx/vmcs.c       Wed May 19 20:50:07 2010 +0100
@@ -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 )
     {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-4.0-testing] vmx: Do not modify global vmx_vm{entry, exit}_control fields in init_vmcs_config(), Xen patchbot-4.0-testing <=