From: Patrick Bridges <bridges@apu.cs.unm.edu>
Date: Thu, 9 Jun 2011 16:50:42 +0000 (-0600)
Subject: Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=5d67a000f2d9e0043237af7c86eecd034119fe93;p=palacios.releases.git

Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into devel
---

5d67a000f2d9e0043237af7c86eecd034119fe93
diff --cc palacios/src/palacios/vmx.c
index 1a23de7,106239f..f26a1ea
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@@ -748,16 -749,15 +749,15 @@@ int v3_vmx_enter(struct guest_info * in
      // disable global interrupts for vm state transition
      v3_disable_ints();
  
 +    // Update timer devices prior to entering VM.  Doing it here 
 +    // makes sure the guest sees any timers that fired while it 
 +    // was in the VMM
 +    v3_update_timers(info);
  
-     if (active_vmcs_ptrs[V3_Get_CPU()] != vmx_info->vmcs_ptr_phys) {
+     if (vmcs_store() != vmx_info->vmcs_ptr_phys) {
  	vmcs_load(vmx_info->vmcs_ptr_phys);
- 	active_vmcs_ptrs[V3_Get_CPU()] = vmx_info->vmcs_ptr_phys;
      }
  
 -
      v3_vmx_restore_vmcs(info);