X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_excp.c;h=f99ce6f7c3489f46e84d7ee134ec5be223a032e1;hb=4b7f19c51325601d7e7569e6101c7bfcdf984ef7;hp=ea6cdc56a260baf47bbddca1fd29fba9c3f66188;hpb=4db5b116275d135e67c67b0781fc8c184e884001;p=palacios.git

diff --git a/palacios/src/palacios/vmm_excp.c b/palacios/src/palacios/vmm_excp.c
index ea6cdc5..f99ce6f 100644
--- a/palacios/src/palacios/vmm_excp.c
+++ b/palacios/src/palacios/vmm_excp.c
@@ -20,6 +20,7 @@
 #include <palacios/vmm_excp.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_types.h>
+#include <palacios/vm_guest.h>
 
 void v3_init_exception_state(struct guest_info * info) {
     info->excp_state.excp_pending = 0;
@@ -38,9 +39,10 @@ int v3_raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t
 	excp_state->excp_num = excp;
 	excp_state->excp_error_code = error_code;
 	excp_state->excp_error_code_valid = 1;
-	//	PrintDebug("[v3_raise_exception_with_error] error code: %x\n", error_code);
+	//	PrintDebug(info->vm_info, info, "[v3_raise_exception_with_error] error code: %x\n", error_code);
     } else {
-	PrintError("exception already pending, currently not implemented\n");
+	PrintError(info->vm_info, info, "Error injecting exception_w_error (excp=%d) (error=%d) -- Exception (%d) (error=%d) already pending\n",
+		   excp, error_code, excp_state->excp_num, excp_state->excp_error_code);
 	return -1;
     }
 
@@ -49,14 +51,15 @@ int v3_raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t
 
 int v3_raise_exception(struct guest_info * info, uint_t excp) {
     struct v3_excp_state * excp_state = &(info->excp_state);
-    //PrintDebug("[v3_raise_exception]\n");
+    //PrintDebug(info->vm_info, info, "[v3_raise_exception]\n");
     if (excp_state->excp_pending == 0) {
 	excp_state->excp_pending = 1;
 	excp_state->excp_num = excp;
 	excp_state->excp_error_code = 0;
 	excp_state->excp_error_code_valid = 0;
     } else {
-	PrintError("exception already pending, currently not implemented\n");
+	PrintError(info->vm_info, info, "Error injecting exception (excp=%d) -- Exception (%d) (error=%d) already pending\n",
+		   excp, excp_state->excp_num, excp_state->excp_error_code);
 	return -1;
     }