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

diff --combined palacios/src/palacios/svm.c
index 52d3201,dffbdb8..6e8bece
--- 1/palacios/src/palacios/svm.c
--- 2/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@@ -1,3 -1,4 +1,4 @@@
+ 
  /* 
   * This file is part of the Palacios Virtual Machine Monitor developed
   * by the V3VEE Project with funding from the United States National 
@@@ -462,9 -463,7 +463,9 @@@ int v3_svm_enter(struct guest_info * in
      // disable global interrupts for vm state transition
      v3_clgi();
  
 -    // Update timer devices prior to entering VM.
 +    // Update timer devices right before entering the VM. Doing it 
 +    // here makes sure the guest sees any timers that fired while 
 +    // it was in the VMM
      v3_update_timers(info);
  
      // Synchronize the guest state to the VMCB
@@@ -670,11 -669,12 +671,12 @@@ int v3_start_svm_guest(struct guest_inf
  
        
  
-       if ((info->num_exits % 5000) == 0) {
+ /*
+       if ((info->num_exits % 50000) == 0) {
            V3_Print("SVM Exit number %d\n", (uint32_t)info->num_exits);
            v3_print_guest_state(info);
        }
- 
+ */
        
      }
  
@@@ -686,6 -686,31 +688,31 @@@
  
  
  
+ int v3_reset_svm_vm_core(struct guest_info * core, addr_t rip) {
+     // init vmcb_bios
+ 
+     // Write the RIP, CS, and descriptor
+     // assume the rest is already good to go
+     //
+     // vector VV -> rip at 0
+     //              CS = VV00
+     //  This means we start executing at linear address VV000
+     //
+     // So the selector needs to be VV00
+     // and the base needs to be VV000
+     //
+     core->rip = 0;
+     core->segments.cs.selector = rip << 8;
+     core->segments.cs.limit = 0xffff;
+     core->segments.cs.base = rip << 12;
+ 
+     return 0;
+ }
+ 
+ 
+ 
+ 
+ 
  
  /* Checks machine SVM capability */
  /* Implemented from: AMD Arch Manual 3, sect 15.4 */ 
@@@ -750,6 -775,7 +777,7 @@@ static int has_svm_nested_paging() 
  }
  
  
+ 
  void v3_init_svm_cpu(int cpu_id) {
      reg_ex_t msr;
      extern v3_cpu_arch_t v3_cpu_types[];

diff --combined palacios/src/palacios/vmx.c
index 1a23de7,106239f..f26a1ea
--- 1/palacios/src/palacios/vmx.c
--- 2/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@@ -47,7 -47,6 +47,6 @@@ static struct vmx_hw_info hw_info
  
  extern v3_cpu_arch_t v3_cpu_types[];
  
- static addr_t active_vmcs_ptrs[V3_CONFIG_MAX_CPUS] = { [0 ... V3_CONFIG_MAX_CPUS - 1] = 0};
  static addr_t host_vmcs_ptrs[V3_CONFIG_MAX_CPUS] = { [0 ... V3_CONFIG_MAX_CPUS - 1] = 0};
  
  extern int v3_vmx_launch(struct v3_gprs * vm_regs, struct guest_info * info, struct v3_ctrl_regs * ctrl_regs);
@@@ -106,7 -105,6 +105,6 @@@ static int init_vmcs_bios(struct guest_
  
      PrintDebug("Loading VMCS\n");
      vmx_ret = vmcs_load(vmx_state->vmcs_ptr_phys);
-     active_vmcs_ptrs[V3_Get_CPU()] = vmx_state->vmcs_ptr_phys;
      vmx_state->state = VMX_UNLAUNCHED;
  
      if (vmx_ret != VMX_SUCCESS) {
@@@ -538,6 -536,9 +536,9 @@@ int v3_init_vmx_vmcs(struct guest_info 
        return -1;
      }
  
+     PrintDebug("Serializing VMCS: %p\n", (void *)vmx_state->vmcs_ptr_phys);
+     vmx_ret = vmcs_clear(vmx_state->vmcs_ptr_phys);
+ 
      return 0;
  }
  
@@@ -745,19 -746,18 +746,18 @@@ int v3_vmx_enter(struct guest_info * in
      // Perform any additional yielding needed for time adjustment
      v3_adjust_time(info);
  
      // 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);
  
  
@@@ -970,7 -970,23 +970,23 @@@ int v3_is_vmx_capable() 
  }
  
  
+ int v3_reset_vmx_vm_core(struct guest_info * core, addr_t rip) {
+     // init vmcs bios
+     
+     if ((core->shdw_pg_mode == NESTED_PAGING) && 
+       (v3_cpu_types[core->pcpu_id] == V3_VMX_EPT_UG_CPU)) {
+       // easy 
+         core->rip = 0;
+       core->segments.cs.selector = rip << 8;
+       core->segments.cs.limit = 0xffff;
+       core->segments.cs.base = rip << 12;
+     } else {
+       core->vm_regs.rdx = core->vcpu_id;
+       core->vm_regs.rbx = rip;
+     }
  
+     return 0;
+ }