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

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

0bfc984ca54c09487a8fd2fafbedf7a00cdb120b
diff --combined palacios/src/palacios/svm.c
index 52a0a5f,7d91c45..33d878f
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@@ -199,7 -199,7 +199,7 @@@ static void Init_VMCB_BIOS(vmcb_t * vmc
  
    if (vm_info->shdw_pg_mode == SHADOW_PAGING) {
      PrintDebug("Creating initial shadow page table\n");
-     vm_info->direct_map_pt = V3_PAddr((addr_t)create_passthrough_pde32_pts(vm_info));
+     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.guest_cr0 = 0x0000000000000010LL;
@@@ -309,7 -309,7 +309,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 -321,7 +321,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 -335,11 +335,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);