X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=6f58b7c04af9890dc8448c0e72edc59849864fb7;hb=ee0e39ad3467f981e379d749b96d4668b6490b80;hp=8277335d9e849e687e7f35a054ffdc2be3e7be3c;hpb=4b013fe3750a387fc034352a7e4379f025dad7c2;p=palacios.releases.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index 8277335..6f58b7c 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -73,18 +73,41 @@ int handle_svm_exit(struct guest_info * info) {
     if (handle_cr0_read(info) == -1) {
       return -1;
     }
+  } else if (exit_code == VMEXIT_CR3_WRITE) {
+    PrintDebug("CR3 Write\n");
 
+    if (handle_cr3_write(info) == -1) {
+      return -1;
+    }    
+  } else if (exit_code == VMEXIT_CR3_READ) {
+    PrintDebug("CR3 Read\n");
+
+    if (handle_cr3_read(info) == -1) {
+      return -1;
+    }
+
+  } else if (exit_code == VMEXIT_EXCP14) {
+    addr_t fault_addr = guest_ctrl->exit_info2;
+    pf_error_t * error_code = (pf_error_t *)&(guest_ctrl->exit_info1);
+    
+    PrintDebug("PageFault at %x (error=%d)\n", fault_addr, *error_code);
+
+  
+
+    if (handle_shadow_pagefault(info, fault_addr, *error_code) == -1) {
+      return -1;
+    }
 
     /*
-  } else if (( (exit_code == VMEXIT_CR3_READ)  ||
-	       (exit_code == VMEXIT_CR3_WRITE) ||
-	       (exit_code == VMEXIT_INVLPG)    ||
-	       (exit_code == VMEXIT_INVLPGA)   || 
-	       (exit_code == VMEXIT_EXCP14)) && 
-	     (info->page_mode == SHADOW_PAGING)) {
-    handle_shadow_paging(info);
+      } else if (( (exit_code == VMEXIT_CR3_READ)  ||
+      (exit_code == VMEXIT_CR3_WRITE) ||
+      (exit_code == VMEXIT_INVLPG)    ||
+      (exit_code == VMEXIT_INVLPGA)   || 
+      (exit_code == VMEXIT_EXCP14)) && 
+      (info->page_mode == SHADOW_PAGING)) {
+      handle_shadow_paging(info);
     */
-
+    
   } else if (exit_code == VMEXIT_INTR) {
 
     //    handle_svm_intr(info);
@@ -93,10 +116,16 @@ int handle_svm_exit(struct guest_info * info) {
     PrintDebug("Guest halted\n");
     return -1;
   } else {
-    addr_t rip_addr = get_addr_linear(info, guest_state->rip, guest_state->cs.selector);
+    addr_t rip_addr;
     char buf[15];
     addr_t host_addr;
 
+    if (info->cpu_mode == REAL) {
+      rip_addr = get_addr_linear(info, guest_state->rip, guest_state->cs.selector);
+    } else {
+      rip_addr = get_addr_linear(info, guest_state->rip, guest_state->cs.base);
+    }
+
 
     PrintDebug("SVM Returned:(VMCB=%x)\n", info->vmm_data); 
     PrintDebug("RIP: %x\n", guest_state->rip);
@@ -141,6 +170,7 @@ int handle_svm_exit(struct guest_info * info) {
       guest_ctrl->EVENTINJ.vector = get_intr_number(&(info->intr_state));
       guest_ctrl->EVENTINJ.valid = 1;
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
+      
       break;
     case NMI:
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_NMI;
@@ -163,7 +193,7 @@ int handle_svm_exit(struct guest_info * info) {
     }
 
 
-    PrintDebug("Injecting Interrupt %d\n", guest_ctrl->EVENTINJ.vector);
+    PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
  
 
     // IMPORTANT TODO
@@ -173,10 +203,16 @@ int handle_svm_exit(struct guest_info * info) {
 
   }
 
+
+
   guest_state->rax = info->vm_regs.rax;
   guest_state->rip = info->rip;
   guest_state->rsp = info->vm_regs.rsp;
 
+  if (exit_code == VMEXIT_INTR) {
+    PrintDebug("INTR ret IP = %x\n", guest_state->rip);
+  }
+
   return 0;
 }
 
@@ -206,19 +242,8 @@ int handle_svm_intr(struct guest_info * info) {
 
   PrintDebug("SVM Returned: Exit Code: %x\n",guest_ctrl->exit_code); 
   PrintDebug("V_INTR_VECTOR: 0x%x\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR);
-  
-
-
 
   while(1);
-
-				     
-
-
-
-  
- 
- 
     
   return 0;
 }