X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=7ac7be2957edb2de00927d518d60fb07a31f3021;hb=d16ef42bba84c7fe88352e5dc23e5e70a5207e29;hp=fed3d258f5399d3b842b634f1d656710206491fb;hpb=eb87f60800c8634e37d1f8e71cd8f88605f2a46e;p=palacios-OLD.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index fed3d25..7ac7be2 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -7,8 +7,6 @@
 #include <palacios/vmm_intr.h>
 
 
-extern struct vmm_os_hooks * os_hooks;
-
 
 int handle_svm_exit(struct guest_info * info) {
   vmcb_ctrl_t * guest_ctrl = 0;
@@ -23,7 +21,7 @@ int handle_svm_exit(struct guest_info * info) {
   info->rip = guest_state->rip;
   info->vm_regs.rsp = guest_state->rsp;
   info->vm_regs.rax = guest_state->rax;
-  info->vm_regs.rsp = guest_state->rsp;  
+
 
 
   info->ctrl_regs.cr0 = guest_state->cr0;
@@ -103,20 +101,18 @@ int handle_svm_exit(struct guest_info * info) {
     
     PrintDebug("PageFault at %x (error=%d)\n", fault_addr, *error_code);
 
-  
-
-    if (handle_shadow_pagefault(info, fault_addr, *error_code) == -1) {
+    if (info->page_mode == SHADOW_PAGING) {
+      if (handle_shadow_pagefault(info, fault_addr, *error_code) == -1) {
+	return -1;
+      }
+    } else {
+      PrintDebug("Page fault in un implemented paging mode\n");
       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_INTR) {
@@ -172,22 +168,39 @@ int handle_svm_exit(struct guest_info * info) {
 
   // Update the low level state
 
-  if (intr_pending(&(info->intr_state))) {
-
-    switch (get_intr_type(&(info->intr_state))) {
-    case EXTERNAL_IRQ:
-      guest_ctrl->EVENTINJ.vector = get_intr_number(&(info->intr_state));
-      guest_ctrl->EVENTINJ.valid = 1;
-      guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
-      
-      break;
+  if (intr_pending(info)) {
+
+    switch (get_intr_type(info)) {
+    case EXTERNAL_IRQ: 
+      {
+	uint_t irq = get_intr_number(info);
+	guest_ctrl->EVENTINJ.vector = irq;
+	guest_ctrl->EVENTINJ.valid = 1;
+	guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
+	
+	injecting_intr(info, irq, EXTERNAL_IRQ);
+	
+	break;
+      }
     case NMI:
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_NMI;
       break;
     case EXCEPTION:
-      guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;
-      guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code;
-      break;
+      {
+	uint_t excp = get_intr_number(info);
+
+	guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;
+	
+	if (info->intr_state.excp_error_code) {
+	  guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code;
+	  guest_ctrl->EVENTINJ.ev = 1;
+	}
+	
+	guest_ctrl->EVENTINJ.vector = excp;
+	
+	injecting_intr(info, excp, EXCEPTION);
+	break;
+      }
     case SOFTWARE:
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
       break;
@@ -201,15 +214,7 @@ int handle_svm_exit(struct guest_info * info) {
       return -1;
     }
 
-
     PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
- 
-
-    // IMPORTANT TODO
-    // We need to figure out stack parameters....
-
-    //EVENTINJ.error_code
-
   }
 
 
@@ -235,34 +240,3 @@ int handle_svm_exit(struct guest_info * info) {
   return 0;
 }
 
-
-
-
-int handle_shadow_paging(struct guest_info * info) {
-  vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
-  //  vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));
-
-  if (guest_ctrl->exit_code == VMEXIT_CR3_READ) {
-
-  }
-
-  return 0;
-}
-
-
-
-int handle_svm_intr(struct guest_info * info) {
-  vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
-  // vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));
-
-  //struct Interrupt_Info * int_info = &(guest_ctrl->exit_int_info);
-
-  //struct vmm_irq_hook * get_irq_hook(&(info->irq_map), int_info->vector);
-
-  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;
-}