X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=8277335d9e849e687e7f35a054ffdc2be3e7be3c;hb=4b013fe3750a387fc034352a7e4379f025dad7c2;hp=d1123b6f9b3dba28c0e75aa6d52727ae5d8fac2e;hpb=1ca13097c7c85318c400c3811ccbb54ac6c619f1;p=palacios.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index d1123b6..8277335 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -22,32 +22,43 @@ int handle_svm_exit(struct guest_info * info) {
   info->rip = guest_state->rip;
   info->vm_regs.rsp = guest_state->rsp;
   info->vm_regs.rax = guest_state->rax;
-  info->vm_regs.rsp = guest_state->rsp;
+  info->vm_regs.rsp = guest_state->rsp;  
 
 
+  exit_code = guest_ctrl->exit_code;
+ 
+  PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); 
+  // PrintDebugVMCB((vmcb_t*)(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));
-
+  //PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); 
   
   if (exit_code == VMEXIT_IOIO) {
     struct svm_io_info * io_info = (struct svm_io_info *)&(guest_ctrl->exit_info1);
     
     if (io_info->type == 0) {
       if (io_info->str) {
-	handle_svm_io_outs(info);
+	if (handle_svm_io_outs(info) == -1 ) {
+	  return -1;
+	}
       } else {
-	handle_svm_io_out(info);
+	if (handle_svm_io_out(info) == -1) {
+	  return -1;
+	}
       }
     } else {
       if (io_info->str) {
-	handle_svm_io_ins(info);
+	if (handle_svm_io_ins(info) == -1) {
+	  return -1;
+	}
       } else {
-	handle_svm_io_in(info);
+	if (handle_svm_io_in(info) == -1) {
+	  return -1;
+	}
       }
     }
   } else if (exit_code == VMEXIT_CR0_WRITE) {
@@ -56,6 +67,14 @@ int handle_svm_exit(struct guest_info * info) {
     if (handle_cr0_write(info) == -1) {
       return -1;
     }
+  } else if (exit_code == VMEXIT_CR0_READ) {
+    PrintDebug("CR0 Read\n");
+
+    if (handle_cr0_read(info) == -1) {
+      return -1;
+    }
+
+
     /*
   } else if (( (exit_code == VMEXIT_CR3_READ)  ||
 	       (exit_code == VMEXIT_CR3_WRITE) ||
@@ -65,6 +84,14 @@ int handle_svm_exit(struct guest_info * info) {
 	     (info->page_mode == SHADOW_PAGING)) {
     handle_shadow_paging(info);
     */
+
+  } else if (exit_code == VMEXIT_INTR) {
+
+    //    handle_svm_intr(info);
+
+  } else if (exit_code == VMEXIT_HLT) {
+    PrintDebug("Guest halted\n");
+    return -1;
   } else {
     addr_t rip_addr = get_addr_linear(info, guest_state->rip, guest_state->cs.selector);
     char buf[15];
@@ -108,11 +135,11 @@ int handle_svm_exit(struct guest_info * info) {
   // Update the low level state
 
   if (intr_pending(&(info->intr_state))) {
-    guest_ctrl->EVENTINJ.vector = get_intr_number(&(info->intr_state));
-    guest_ctrl->EVENTINJ.valid = 1;
- 
+
     switch (get_intr_type(&(info->intr_state))) {
     case EXTERNAL_IRQ:
+      guest_ctrl->EVENTINJ.vector = get_intr_number(&(info->intr_state));
+      guest_ctrl->EVENTINJ.valid = 1;
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
       break;
     case NMI:
@@ -120,7 +147,7 @@ int handle_svm_exit(struct guest_info * info) {
       break;
     case EXCEPTION:
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;
-      guest_ctrl->EVENTINJ.excp_error_code = info->intr_state.excp_error_code;
+      guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code;
       break;
     case SOFTWARE:
       guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
@@ -135,6 +162,10 @@ int handle_svm_exit(struct guest_info * info) {
       return -1;
     }
 
+
+    PrintDebug("Injecting Interrupt %d\n", guest_ctrl->EVENTINJ.vector);
+ 
+
     // IMPORTANT TODO
     // We need to figure out stack parameters....
 
@@ -165,3 +196,29 @@ int handle_shadow_paging(struct guest_info * info) {
 
 
 
+int handle_svm_intr(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));
+
+  //struct Interrupt_Info * int_info = &(guest_ctrl->exit_int_info);
+
+  //struct vmm_irq_hook * get_irq_hook(&(info->irq_map), int_info->vector);
+
+  PrintDebug("SVM Returned: Exit Code: %x\n",guest_ctrl->exit_code); 
+  PrintDebug("V_INTR_VECTOR: 0x%x\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR);
+  
+
+
+
+  while(1);
+
+				     
+
+
+
+  
+ 
+ 
+    
+  return 0;
+}