something that sort of works more than it did previously....

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

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index 23efbc6..a2e7e14 100644 (file)
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -4,6 +4,7 @@
 #include <palacios/vmm_emulate.h>
 #include <palacios/svm_ctrl_regs.h>
 #include <palacios/svm_io.h>
+#include <palacios/vmm_intr.h>
 
 extern struct vmm_os_hooks * os_hooks;
 
@@ -21,40 +22,42 @@ 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;
-
-
-  PrintDebug("SVM Returned:(VMCB=%x)\n", info->vmm_data); 
-  PrintDebug("RIP: %x\n", guest_state->rip);
-  
+  info->vm_regs.rsp = guest_state->rsp;  
 
 
   exit_code = guest_ctrl->exit_code;
-  
+ 
   // PrintDebugVMCB((vmcb_t*)(info->vmm_data));
-  PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); 
 
-  PrintDebug("io_info1 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info1));
-  PrintDebug("io_info1 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info1)) + 4));
 
-  PrintDebug("io_info2 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info2));
-  PrintDebug("io_info2 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info2)) + 4));
+  // PrintDebug("SVM Returned:(VMCB=%x)\n", info->vmm_data); 
+  //PrintDebug("RIP: %x\n", guest_state->rip);
 
   
+  //PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); 
+  
   if (exit_code == VMEXIT_IOIO) {
     struct svm_io_info * io_info = (struct svm_io_info *)&(guest_ctrl->exit_info1);
     
     if (io_info->type == 0) {
       if (io_info->str) {
-       handle_svm_io_outs(info);
+       if (handle_svm_io_outs(info) == -1 ) {
+         return -1;
+       }
       } else {
-       handle_svm_io_out(info);
+       if (handle_svm_io_out(info) == -1) {
+         return -1;
+       }
       }
     } else {
       if (io_info->str) {
-       handle_svm_io_ins(info);
+       if (handle_svm_io_ins(info) == -1) {
+         return -1;
+       }
       } else {
-       handle_svm_io_in(info);
+       if (handle_svm_io_in(info) == -1) {
+         return -1;
+       }
       }
     }
   } else if (exit_code == VMEXIT_CR0_WRITE) {
@@ -72,11 +75,30 @@ 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];
     addr_t host_addr;
 
+
+    PrintDebug("SVM Returned:(VMCB=%x)\n", info->vmm_data); 
+    PrintDebug("RIP: %x\n", guest_state->rip);
+    PrintDebug("RIP Linear: %x\n", rip_addr);
+    
+    PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); 
+    
+    PrintDebug("io_info1 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info1));
+    PrintDebug("io_info1 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info1)) + 4));
+    
+    PrintDebug("io_info2 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info2));
+    PrintDebug("io_info2 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info2)) + 4));
+
+    
+
     if (guest_pa_to_host_pa(info, guest_state->rip, &host_addr) == -1) {
       PrintDebug("Could not translate guest_state->rip to host address\n");
       return -1;
@@ -92,10 +114,48 @@ int handle_svm_exit(struct guest_info * info) {
 
     PrintTraceMemDump(buf, 15);
 
+    while(1);
+
   }
 
 
   // Update the low level state
+
+  if (intr_pending(&(info->intr_state))) {
+    guest_ctrl->EVENTINJ.vector = get_intr_number(&(info->intr_state));
+    guest_ctrl->EVENTINJ.valid = 1;
+ 
+    switch (get_intr_type(&(info->intr_state))) {
+    case EXTERNAL_IRQ:
+      guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
+      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;
+    case SOFTWARE:
+      guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
+      break;
+    case VIRTUAL:
+      guest_ctrl->EVENTINJ.type = SVM_INJECTION_VIRTUAL_INTR;
+      break;
+
+    case INVALID_INTR: 
+    default:
+      PrintDebug("Attempted to issue an invalid interrupt\n");
+      return -1;
+    }
+
+    // IMPORTANT TODO
+    // We need to figure out stack parameters....
+
+    //EVENTINJ.error_code
+
+  }
+
   guest_state->rax = info->vm_regs.rax;
   guest_state->rip = info->rip;
   guest_state->rsp = info->vm_regs.rsp;
@@ -119,3 +179,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;
+}