reworked the paging functions

[palacios.git] / palacios / src / palacios / svm.c

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index ee2c4fd..96802d4 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -73,7 +73,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
   //ctrl_area->instrs.instrs.CR0 = 1;
   ctrl_area->cr_reads.cr0 = 1;
   ctrl_area->cr_writes.cr0 = 1;
-  ctrl_area->cr_reads.cr4 = 1;
+  //ctrl_area->cr_reads.cr4 = 1;
   ctrl_area->cr_writes.cr4 = 1;
 
 
@@ -90,9 +90,10 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
   */
 
   guest_state->efer |= EFER_MSR_svm_enable;
+  vm_info->guest_efer.value = 0x0LL;
 
   v3_hook_msr(vm_info, EFER_MSR, 
-             NULL, /*&v3_handle_efer_read,*/ 
+             &v3_handle_efer_read,
              &v3_handle_efer_write, 
              vm_info);
 
@@ -147,6 +148,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
 
   guest_state->cr0 = 0x60000010;
 
+
   guest_state->cs.selector = 0xf000;
   guest_state->cs.limit=0xffff;
   guest_state->cs.base = 0x0000000f0000LL;
@@ -231,12 +233,9 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
     vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_32(vm_info));
     /* End Test */
 
-    //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->direct_map_pt;
 
@@ -396,9 +395,18 @@ static int start_svm_guest(struct guest_info *info) {
       PrintDebug("RIP Linear: %p\n", (void *)linear_addr);
       v3_print_segments(info);
       v3_print_ctrl_regs(info);
+      if (info->shdw_pg_mode == SHADOW_PAGING) {
+       PrintDebug("Shadow Paging Guest Registers:\n");
+       PrintDebug("\tGuest CR0=%p\n", (void *)(addr_t)(info->shdw_pg_state.guest_cr0));
+       PrintDebug("\tGuest CR3=%p\n", (void *)(addr_t)(info->shdw_pg_state.guest_cr3));
+       // efer
+       // CR4
+      }
       v3_print_GPRs(info);
 
 
+      
+
 
       PrintDebug("SVM Exit Code: %p\n", (void *)(addr_t)guest_ctrl->exit_code);