real->protected mode switch should work now

[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 964aeac..6cd7afe 100644 (file)
--- a/palacios/src/geekos/svm_handler.c
+++ b/palacios/src/geekos/svm_handler.c
@@ -2,8 +2,10 @@
 #include <geekos/vmm.h>
 #include <geekos/svm_ctrl_regs.h>
 
+extern struct vmm_os_hooks * os_hooks;
 
-int handle_svm_exit(guest_info_t * info) {
+
+int handle_svm_exit(struct guest_info * info) {
   vmcb_ctrl_t * guest_ctrl = 0;
   vmcb_saved_state_t * guest_state = 0;
   ulong_t exit_code = 0;
@@ -14,33 +16,36 @@ int handle_svm_exit(guest_info_t * info) {
 
   // Update the high level state 
   info->rip = guest_state->rip;
-  info->rsp = guest_state->rsp;
+  info->vm_regs.rsp = guest_state->rsp;
+  info->vm_regs.rax = guest_state->rax;
+  info->vm_regs.rsp = guest_state->rsp;
 
 
-  PrintDebug("SVM Returned: (Exit Code=%x) (VMCB=%x)\n",&(guest_ctrl->exit_code), info->vmm_data); 
+  PrintDebug("SVM Returned:(VMCB=%x)\n", info->vmm_data); 
   PrintDebug("RIP: %x\n", guest_state->rip);
   
 
 
   exit_code = guest_ctrl->exit_code;
   
-  //  PrintDebugVMCB((vmcb_t*)(info->vmm_data));
+  // PrintDebugVMCB((vmcb_t*)(info->vmm_data));
   PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); 
+
   PrintDebug("io_info1 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info1));
   PrintDebug("io_info1 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info1)) + 4));
 
   PrintDebug("io_info2 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info2));
   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;
+    if (handle_cr0_write(info) == -1) {
+      return -1;
+    }
 
   } else if (( (exit_code == VMEXIT_CR3_READ)  ||
               (exit_code == VMEXIT_CR3_WRITE) ||
@@ -53,8 +58,9 @@ int handle_svm_exit(guest_info_t * info) {
 
 
   // Update the low level state
+  guest_state->rax = info->vm_regs.rax;
   guest_state->rip = info->rip;
-  guest_state->rsp = info->rsp;
+  guest_state->rsp = info->vm_regs.rsp;
 
   return 0;
 }
@@ -62,7 +68,7 @@ int handle_svm_exit(guest_info_t * info) {
 
 
 // This should package up an IO request and call vmm_handle_io
-int handle_svm_io(guest_info_t * info) {
+int handle_svm_io(struct guest_info * info) {
   vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA((vmcb_t *)(info->vmm_data));
   vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));
 
@@ -85,7 +91,7 @@ int handle_svm_io(guest_info_t * info) {
 }
 
 
-int handle_shadow_paging(guest_info_t * info) {
+int handle_shadow_paging(struct guest_info * info) {
   vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
   //  vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));