X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=b9d124f6126e1c636aadf36143fc1bc841384bcd;hb=c502aac6baf363d633aca6ec883b05476634e854;hp=83f76283b35933f40395705bfa00cc1e81157724;hpb=56447cc42b250554dc3e49dd805d198a0e9a256c;p=palacios.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index 83f7628..b9d124f 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -1,9 +1,10 @@
 #include <palacios/svm_handler.h>
 #include <palacios/vmm.h>
 #include <palacios/vm_guest_mem.h>
-#include <palacios/vmm_emulate.h>
+#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>
 
 
@@ -38,10 +39,10 @@ int handle_svm_exit(struct guest_info * info) {
  
 
   // Disable printing io exits due to bochs debug messages
-  if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) {
+  //if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) {
 
-    PrintDebug("SVM Returned: Exit Code: %x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); 
-  }
+  PrintDebug("SVM Returned: Exit Code: %x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); 
+    //  }
   // PrintDebugVMCB((vmcb_t*)(info->vmm_data));
 
 
@@ -106,7 +107,7 @@ int handle_svm_exit(struct guest_info * info) {
     
     PrintDebug("PageFault at %x (error=%d)\n", fault_addr, *error_code);
 
-    if (info->page_mode == SHADOW_PAGING) {
+    if (info->shdw_pg_mode == SHADOW_PAGING) {
       if (handle_shadow_pagefault(info, fault_addr, *error_code) == -1) {
 	return -1;
       }
@@ -116,7 +117,7 @@ int handle_svm_exit(struct guest_info * info) {
     }
 
   } else if (exit_code == VMEXIT_INVLPG) {
-    if (info->page_mode == SHADOW_PAGING) {
+    if (info->shdw_pg_mode == SHADOW_PAGING) {
       PrintDebug("Invlpg\n");
       if (handle_shadow_invlpg(info) == -1) {
 	return -1;
@@ -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];
@@ -158,8 +161,18 @@ int handle_svm_exit(struct guest_info * info) {
 
     
 
-    if (guest_pa_to_host_pa(info, guest_state->rip, &host_addr) == -1) {
-      PrintDebug("Could not translate guest_state->rip to host address\n");
+    if (info->mem_mode == PHYSICAL_MEM) {
+      if (guest_pa_to_host_pa(info, guest_state->rip, &host_addr) == -1) {
+	PrintDebug("Could not translate guest_state->rip to host address\n");
+	return -1;
+      }
+    } else if (info->mem_mode == VIRTUAL_MEM) {
+      if (guest_va_to_host_pa(info, guest_state->rip, &host_addr) == -1) {
+	PrintDebug("Could not translate guest_state->rip to host address\n");
+	return -1;
+      }
+    } else {
+      PrintDebug("Invalid memory mode\n");
       return -1;
     }
 
@@ -169,7 +182,11 @@ int handle_svm_exit(struct guest_info * info) {
     
     PrintDebug("Reading from 0x%x in guest\n", rip_addr);
     
-    read_guest_pa_memory(info, rip_addr, 15, buf);
+    if (info->mem_mode == PHYSICAL_MEM) {
+      read_guest_pa_memory(info, rip_addr, 15, buf);
+    } else {
+      read_guest_va_memory(info, rip_addr, 15, buf);
+    }
 
     PrintTraceMemDump(buf, 15);
 
@@ -197,6 +214,8 @@ int handle_svm_exit(struct guest_info * info) {
 	guest_ctrl->guest_ctrl.V_IGN_TPR = 1;
 	guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf;
 
+	PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR, info->rip);
+
 	injecting_intr(info, irq, EXTERNAL_IRQ);
 	
 	break;
@@ -217,13 +236,14 @@ int handle_svm_exit(struct guest_info * info) {
 	
 	guest_ctrl->EVENTINJ.vector = excp;
 	
+	PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
 	injecting_intr(info, excp, EXCEPTION);
 	break;
       }
-    case SOFTWARE:
+    case SOFTWARE_INTR:
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
       break;
-    case VIRTUAL:
+    case VIRTUAL_INTR:
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_VIRTUAL_INTR;
       break;
 
@@ -233,7 +253,6 @@ int handle_svm_exit(struct guest_info * info) {
       return -1;
     }
 
-    PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
   }