X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=10d3af6be2b2da0feab1aeac4aa7162b8ecd4805;hb=8a6d2dbc1b6d593cab383bb04f3fe778949376b2;hp=fa711629c6e3f890c4a8a673f52a258b1c81c5b2;hpb=41d6dcb0a638ebdc01b89a9edf427c75975b2003;p=palacios.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index fa71162..10d3af6 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -4,6 +4,7 @@
 #include <palacios/vmm_decoder.h>
 #include <palacios/vmm_ctrl_regs.h>
 #include <palacios/svm_io.h>
+#include <palacios/svm_halt.h>
 #include <palacios/vmm_intr.h>
 
 
@@ -40,7 +41,7 @@ int handle_svm_exit(struct guest_info * info) {
   // Disable printing io exits due to bochs debug messages
   //if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) {
 
-  PrintDebug("SVM Returned: Exit Code: %x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); 
+  PrintDebug("SVM Returned: Exit Code: 0x%x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); 
     //  }
   // PrintDebugVMCB((vmcb_t*)(info->vmm_data));
 
@@ -131,9 +132,15 @@ int handle_svm_exit(struct guest_info * info) {
 
     //    handle_svm_intr(info);
 
+  } else if (exit_code == VMEXIT_SMI) { 
+
+    //   handle_svm_smi(info); // ignored for now
+
   } else if (exit_code == VMEXIT_HLT) {
     PrintDebug("Guest halted\n");
-    return -1;
+    if (handle_svm_halt(info) == -1) {
+      return -1;
+    }
   } else {
     addr_t rip_addr;
     char buf[15];
@@ -229,10 +236,12 @@ int handle_svm_exit(struct guest_info * info) {
 	if (info->intr_state.excp_error_code) {
 	  guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code;
 	  guest_ctrl->EVENTINJ.ev = 1;
+	  PrintDebug("Injecting error code %x\n", guest_ctrl->EVENTINJ.error_code);
 	}
 	
 	guest_ctrl->EVENTINJ.vector = excp;
 	
+	guest_ctrl->EVENTINJ.valid = 1;
 	PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
 	injecting_intr(info, excp, EXCEPTION);
 	break;