Devices updated for revised checkpoint interface

[palacios.releases.git] / palacios / src / palacios / vmx_handler.c

diff --git a/palacios/src/palacios/vmx_handler.c b/palacios/src/palacios/vmx_handler.c
index 51bf62d..5a789db 100644 (file)
--- a/palacios/src/palacios/vmx_handler.c
+++ b/palacios/src/palacios/vmx_handler.c
@@ -24,6 +24,7 @@
 #include <palacios/vmx_lowlevel.h>
 #include <palacios/vmx_io.h>
 #include <palacios/vmm_cpuid.h>
+#include <palacios/vmm_debug.h>
 
 #include <palacios/vmx.h>
 #include <palacios/vmm_ctrl_regs.h>
@@ -31,8 +32,10 @@
 #include <palacios/vmx_ctrl_regs.h>
 #include <palacios/vmx_assist.h>
 #include <palacios/vmm_halt.h>
+#include <palacios/vmm_mwait.h>
 #include <palacios/vmx_ept.h>
 
+
 #ifndef V3_CONFIG_DEBUG_VMX
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
@@ -105,7 +108,6 @@ int v3_handle_vmx_exit(struct guest_info * info, struct vmx_exit_info * exit_inf
                 }
            } else if ((uint8_t)exit_info->int_info == 2) {
                // NMI. Don't do anything
-               V3_Print("NMI Exception Received\n");
             } else {
                 PrintError("Unknown exception: 0x%x\n", (uint8_t)exit_info->int_info);
                 v3_print_GPRs(info);
@@ -235,6 +237,12 @@ int v3_handle_vmx_exit(struct guest_info * info, struct vmx_exit_info * exit_inf
                        return -1;
                    }
                    break;
+               case 8:
+                   if (v3_vmx_handle_cr8_access(info, cr_qual) == -1) {
+                       PrintError("Error in CR8 access handler\n");
+                       return -1;
+                   }
+                   break;
                default:
                    PrintError("Unhandled CR access: %d\n", cr_qual->cr_id);
                    return -1;
@@ -257,6 +265,25 @@ int v3_handle_vmx_exit(struct guest_info * info, struct vmx_exit_info * exit_inf
 
             break;
 
+        case VMX_EXIT_MONITOR:
+            PrintDebug("Guest Executing monitor\n");
+
+            if (v3_handle_monitor(info) == -1) {
+               PrintError("Error handling monitor instruction\n");
+                return -1;
+            }
+
+            break;
+
+        case VMX_EXIT_MWAIT:
+            PrintDebug("Guest Executing mwait\n");
+
+            if (v3_handle_mwait(info) == -1) {
+               PrintError("Error handling mwait instruction\n");
+                return -1;
+            }
+
+            break;
 
 
         case VMX_EXIT_PAUSE: