*** empty log message ***

[palacios.git] / palacios / src / geekos / svm_handler.c

diff --git a/palacios/src/geekos/svm_handler.c b/palacios/src/geekos/svm_handler.c
index 6840ade..e9d2a90 100644 (file)
--- a/palacios/src/geekos/svm_handler.c
+++ b/palacios/src/geekos/svm_handler.c
@@ -1,6 +1,6 @@
 #include <geekos/svm_handler.h>
 #include <geekos/vmm.h>
-
+#include <geekos/svm_ctrl_regs.h>
 
 
 
@@ -12,10 +12,17 @@ int handle_svm_exit(guest_info_t * info) {
   guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
   guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));
   
+
+  // Update the high level state 
+  info->rip = guest_state->rip;
+  info->rsp = guest_state->rsp;
+
+
   PrintDebug("SVM Returned: (Exit Code=%x) (VMCB=%x)\n",&(guest_ctrl->exit_code), info->vmm_data); 
   PrintDebug("RIP: %x\n", guest_state->rip);
   
-  
+
+
   exit_code = guest_ctrl->exit_code;
   
   //  PrintDebugVMCB((vmcb_t*)(info->vmm_data));
@@ -27,6 +34,15 @@ int handle_svm_exit(guest_info_t * info) {
   PrintDebug("io_info2 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info2)) + 4));
   if (exit_code == VMEXIT_IOIO) {
     handle_svm_io(info);
+
+  } else if (exit_code == VMEXIT_CR0_WRITE) {
+    PrintDebug("CR0 Write\n");
+    ullong_t new_cr0 = 0;
+
+    handle_cr0_write(info, &new_cr0);
+
+    guest_state->cr0 = new_cr0;
+
   } else if (( (exit_code == VMEXIT_CR3_READ)  ||
               (exit_code == VMEXIT_CR3_WRITE) ||
               (exit_code == VMEXIT_INVLPG)    ||
@@ -37,6 +53,10 @@ int handle_svm_exit(guest_info_t * info) {
   }
 
 
+  // Update the low level state
+  guest_state->rip = info->rip;
+  guest_state->rsp = info->rsp;
+
   return 0;
 }
 
@@ -76,3 +96,6 @@ int handle_shadow_paging(guest_info_t * info) {
 
   return 0;
 }
+
+
+