X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=c7ee14c4950fd3d70a8838be6764bfa70c2fbc50;hb=df58bd3c484a52b1e166dc28e7b9b6fd94e5a023;hp=d1123b6f9b3dba28c0e75aa6d52727ae5d8fac2e;hpb=1ca13097c7c85318c400c3811ccbb54ac6c619f1;p=palacios.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index d1123b6..c7ee14c 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -22,18 +22,13 @@ 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->vm_regs.rsp = guest_state->rsp;  
 
 
   exit_code = guest_ctrl->exit_code;
-  
+ 
   // PrintDebugVMCB((vmcb_t*)(info->vmm_data));
 
-  
   if (exit_code == VMEXIT_IOIO) {
     struct svm_io_info * io_info = (struct svm_io_info *)&(guest_ctrl->exit_info1);
     
@@ -65,6 +60,9 @@ int handle_svm_exit(struct guest_info * info) {
 	     (info->page_mode == SHADOW_PAGING)) {
     handle_shadow_paging(info);
     */
+
+  } else if (exit_code == VMEXIT_INTR) {
+    handle_svm_intr(info);
   } else {
     addr_t rip_addr = get_addr_linear(info, guest_state->rip, guest_state->cs.selector);
     char buf[15];
@@ -120,7 +118,7 @@ int handle_svm_exit(struct guest_info * info) {
       break;
     case EXCEPTION:
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;
-      guest_ctrl->EVENTINJ.excp_error_code = info->intr_state.excp_error_code;
+      guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code;
       break;
     case SOFTWARE:
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
@@ -165,3 +163,29 @@ int handle_shadow_paging(struct guest_info * info) {
 
 
 
+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;
+}