X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=4b01c8bfbe4220e1fdbd71c2c4a22e7de300908a;hp=7dcd68d4bdac36ab7eca00c357b1e9fc1b32f158;hb=888c2dd8a3914f9a08e2b0e006ff96c5cc5cd792;hpb=5bf6d0c260240e314876a2fca8e3fd56bd6a1029

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 7dcd68d..4b01c8b 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -44,6 +44,8 @@
 #include <palacios/vmm_sprintf.h>
 
 
+uint32_t v3_last_exit;
+
 // This is a global pointer to the host's VMCB
 static addr_t host_vmcbs[CONFIG_MAX_CPUS] = { [0 ... CONFIG_MAX_CPUS - 1] = 0};
 
@@ -307,7 +309,7 @@ static int update_irq_exit_state(struct guest_info * info) {
 	// Interrupt was taken fully vectored
 	info->intr_state.irq_started = 0;
 
-    } else {
+    } else if ((info->intr_state.irq_started == 1) && (guest_ctrl->exit_int_info.valid == 1)) {
 #ifdef CONFIG_DEBUG_INTERRUPTS
 	PrintDebug("EXIT INT INFO is set (vec=%d)\n", guest_ctrl->exit_int_info.vector);
 #endif
@@ -320,6 +322,12 @@ static int update_irq_exit_state(struct guest_info * info) {
 static int update_irq_entry_state(struct guest_info * info) {
     vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
 
+
+    if (info->intr_state.irq_pending == 0) {
+	guest_ctrl->guest_ctrl.V_IRQ = 0;
+	guest_ctrl->guest_ctrl.V_INTR_VECTOR = 0;
+    }
+    
     if (v3_excp_pending(info)) {
 	uint_t excp = v3_get_excp_number(info);
 	
@@ -463,10 +471,15 @@ int v3_svm_enter(struct guest_info * info) {
 
 
     rdtscll(info->time_state.cached_host_tsc);
-    //    guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc;
+    guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc;
 	
     v3_svm_launch((vmcb_t *)V3_PAddr(info->vmm_data), &(info->vm_regs), (vmcb_t *)host_vmcbs[info->cpu_id]);
     
+
+    v3_last_exit = (uint32_t)(guest_ctrl->exit_code);
+
+    //  v3_print_cond("SVM Returned: Exit Code: %x\n", (uint32_t)(guest_ctrl->exit_code));
+
     rdtscll(tmp_tsc);
 
     //PrintDebug("SVM Returned\n");
@@ -583,13 +596,12 @@ int v3_start_svm_guest(struct guest_info *info) {
 	    break;
 	}
 	
+/*
 	if ((info->num_exits % 5000) == 0) {
 	    V3_Print("SVM Exit number %d\n", (uint32_t)info->num_exits);
 	}
-
-
+*/
 	
-
     }
     return 0;
 }