reworked some of the interrupt handling

[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 6f58b7c..54be157 100644 (file)
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -2,10 +2,11 @@
 #include <palacios/vmm.h>
 #include <palacios/vm_guest_mem.h>
 #include <palacios/vmm_emulate.h>
-#include <palacios/svm_ctrl_regs.h>
+#include <palacios/vmm_ctrl_regs.h>
 #include <palacios/svm_io.h>
 #include <palacios/vmm_intr.h>
 
+
 extern struct vmm_os_hooks * os_hooks;
 
 
@@ -25,6 +26,16 @@ int handle_svm_exit(struct guest_info * info) {
   info->vm_regs.rsp = guest_state->rsp;  
 
 
+  info->ctrl_regs.cr0 = guest_state->cr0;
+  info->ctrl_regs.cr2 = guest_state->cr2;
+  info->ctrl_regs.cr3 = guest_state->cr3;
+  info->ctrl_regs.cr4 = guest_state->cr4;
+  info->ctrl_regs.cr8 = guest_ctrl->guest_ctrl.V_TPR;
+  info->ctrl_regs.rflags = guest_state->rflags;
+
+  get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments));
+
+
   exit_code = guest_ctrl->exit_code;
  
   PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); 
@@ -120,11 +131,9 @@ int handle_svm_exit(struct guest_info * info) {
     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);
-    }
+
+    rip_addr = get_addr_linear(info, guest_state->rip, &(info->segments.cs));
+
 
 
     PrintDebug("SVM Returned:(VMCB=%x)\n", info->vmm_data); 
@@ -163,22 +172,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;
@@ -194,7 +220,7 @@ int handle_svm_exit(struct guest_info * info) {
 
 
     PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
- 
+
 
     // IMPORTANT TODO
     // We need to figure out stack parameters....
@@ -204,11 +230,21 @@ int handle_svm_exit(struct guest_info * info) {
   }
 
 
+  guest_state->cr0 = info->ctrl_regs.cr0;
+  guest_state->cr2 = info->ctrl_regs.cr2;
+  guest_state->cr3 = info->ctrl_regs.cr3;
+  guest_state->cr4 = info->ctrl_regs.cr4;
+  guest_ctrl->guest_ctrl.V_TPR = info->ctrl_regs.cr8 & 0xff;
+  guest_state->rflags = info->ctrl_regs.rflags;
+
 
   guest_state->rax = info->vm_regs.rax;
   guest_state->rip = info->rip;
   guest_state->rsp = info->vm_regs.rsp;
 
+
+  set_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments));
+
   if (exit_code == VMEXIT_INTR) {
     PrintDebug("INTR ret IP = %x\n", guest_state->rip);
   }