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

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index 15e320f..d1123b6 100644
--- 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;
 
@@ -105,6 +106,42 @@ int handle_svm_exit(struct guest_info * info) {
 
 
   // 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.excp_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;