X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=93a366e28fda69150b1baca28ff6e7ee0f87a687;hb=bf091be03d4a623fa1a9b3151698a4564a8339ba;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..93a366e 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>
 
 
@@ -133,7 +134,9 @@ int handle_svm_exit(struct guest_info * info) {
 
   } 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 +232,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;