From: Trammell Hudson <thudson@newskysaw.eecs.northwestern.edu>
Date: Wed, 22 Oct 2008 18:50:26 +0000 (-0500)
Subject: Merge branch 'kitten' of ssh://sharedev@localhost/home/sharedev/palacios into kitten
X-Git-Tag: 1.0^2~4^2~2
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=c0c9f2110ba4830893373b9471a4ff4242489f72;hp=-c

Merge branch 'kitten' of ssh://sharedev@localhost/home/sharedev/palacios into kitten
---

c0c9f2110ba4830893373b9471a4ff4242489f72
diff --combined palacios/src/palacios/svm.c
index 33d878f,bd5deca..95bb586
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@@ -201,11 -201,15 +201,15 @@@ static void Init_VMCB_BIOS(vmcb_t * vmc
      PrintDebug("Creating initial shadow page table\n");
      vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pde32_pts(vm_info));
  
-     vm_info->shdw_pg_state.shadow_cr3 |= (vm_info->direct_map_pt & ~0xfff);
+     //vm_info->shdw_pg_state.shadow_cr3 |= (vm_info->direct_map_pt & ~0xfff);
+     vm_info->shdw_pg_state.shadow_cr3 = 0;
      vm_info->shdw_pg_state.guest_cr0 = 0x0000000000000010LL;
      PrintDebug("Created\n");
  
-     guest_state->cr3 = vm_info->shdw_pg_state.shadow_cr3;
+     //guest_state->cr3 = vm_info->shdw_pg_state.shadow_cr3;
+ 
+     guest_state->cr3 = vm_info->direct_map_pt;
+ 
  
      //PrintDebugPageTables((pde32_t*)(vm_info->shdw_pg_state.shadow_cr3.e_reg.low));
  
@@@ -309,7 -313,7 +313,7 @@@ static int start_svm_guest(struct guest
      v3_clgi();
  
  
 -    PrintDebug("SVM Entry to rip=%p...\n", (void *)info->rip);
 +    //PrintDebug("SVM Entry to rip=%p...\n", (void *)info->rip);
  
      v3_get_msr(0xc0000101, &vm_cr_high, &vm_cr_low);
  
@@@ -321,7 -325,7 +325,7 @@@
      rdtscll(tmp_tsc);
  
      v3_set_msr(0xc0000101, vm_cr_high, vm_cr_low);
 -    PrintDebug("SVM Returned\n");
 +    //PrintDebug("SVM Returned\n");
  
  
  #if PrintDebug
@@@ -335,11 -339,11 +339,11 @@@
      v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
      num_exits++;
  
 -    PrintDebug("Turning on global interrupts\n");
 +    //PrintDebug("Turning on global interrupts\n");
      v3_stgi();
  
  
 -    PrintDebug("SVM Exit number %d\n", num_exits);
 +    //PrintDebug("SVM Exit number %d\n", num_exits);