X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=be9b074ed8cc057685c22cf0aca656f391231173;hb=b93aeabee44c82139a9afd065dfcaca8ac6688ad;hp=50d2b85087c7b5c6a73f3a6d18b894072e6e6016;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 50d2b85..be9b074 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -189,15 +189,11 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * core) {
     core->dbg_regs.dr7 = 0x0000000000000400LL;
 
 
-    /** THESE NEED TO BE MOVED TO GLOBAL LOCATION **/
-    v3_init_svm_io_map(core->vm_info);
     ctrl_area->IOPM_BASE_PA = (addr_t)V3_PAddr(core->vm_info->io_map.arch_data);
     ctrl_area->instrs.IOIO_PROT = 1;
-
-    v3_init_svm_msr_map(core->vm_info);
+	    
     ctrl_area->MSRPM_BASE_PA = (addr_t)V3_PAddr(core->vm_info->msr_map.arch_data);
-    ctrl_area->instrs.MSR_PROT = 1;
-    /** *** **/
+    ctrl_area->instrs.MSR_PROT = 1;   
 
 
     PrintDebug("Exiting on interrupts\n");
@@ -310,7 +306,7 @@ static int update_irq_exit_state(struct guest_info * info) {
 	// Interrupt was taken fully vectored
 	info->intr_core_state.irq_started = 0;
 
-    } else {
+    } else if ((info->intr_core_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
@@ -323,6 +319,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_core_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);
 	
@@ -439,8 +441,8 @@ int v3_svm_enter(struct guest_info * info) {
     guest_state->rip = info->rip;
     guest_state->rsp = info->vm_regs.rsp;
 
-#ifdef CONFIG_SYMBIOTIC
-    if (info->vm_info->sym_state.symcalls[info->cpu_id].sym_call_active == 0) {
+#ifdef CONFIG_SYMCALL
+    if (info->sym_core_state.symcall_state.sym_call_active == 0) {
 	update_irq_entry_state(info);
     }
 #else 
@@ -456,8 +458,8 @@ int v3_svm_enter(struct guest_info * info) {
       (void *)(addr_t)info->rip);
     */
 
-#ifdef CONFIG_SYMBIOTIC
-    if (info->vm_info->sym_state.symcalls[info->cpu_id].sym_call_active == 1) {
+#ifdef CONFIG_SYMCALL
+    if (info->sym_core_state.symcall_state.sym_call_active == 1) {
 	if (guest_ctrl->guest_ctrl.V_IRQ == 1) {
 	    V3_Print("!!! Injecting Interrupt during Sym call !!!\n");
 	}
@@ -465,23 +467,28 @@ int v3_svm_enter(struct guest_info * info) {
 #endif
 
 
+    rdtscll(tmp_tsc);
+    v3_update_time(info, (tmp_tsc - info->time_state.cached_host_tsc));
     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_Print("Calling v3_svm_launch\n");
 	
     v3_svm_launch((vmcb_t *)V3_PAddr(info->vmm_data), &(info->vm_regs), (vmcb_t *)host_vmcbs[info->cpu_id]);
     
+    //V3_Print("SVM Returned: Exit Code: %x, guest_rip=%lx\n", (uint32_t)(guest_ctrl->exit_code), (unsigned long)guest_state->rip);
 
-    v3_last_exit = (uint32_t)(guest_ctrl->exit_code);
 
-    //  v3_print_cond("SVM Returned: Exit Code: %x\n", (uint32_t)(guest_ctrl->exit_code));
+    v3_last_exit = (uint32_t)(guest_ctrl->exit_code);
 
-    rdtscll(tmp_tsc);
+    //rdtscll(tmp_tsc);
+    //    v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
 
     //PrintDebug("SVM Returned\n");
     
     info->num_exits++;
 
-    v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
+
 
 
     // Save Guest state from VMCB
@@ -513,8 +520,8 @@ int v3_svm_enter(struct guest_info * info) {
     exit_info2 = guest_ctrl->exit_info2;
 
 
-#ifdef CONFIG_SYMBIOTIC
-    if (info->vm_info->sym_state.symcalls[info->cpu_id].sym_call_active == 0) {
+#ifdef CONFIG_SYMCALL
+    if (info->sym_core_state.symcall_state.sym_call_active == 0) {
 	update_irq_exit_state(info);
     }
 #else