X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx.c;h=bdfc8c04cb19fa8ac923a71cfd8d35679fec1bc4;hb=55e1aec9b0d2358b02721d3d331089e100f3fe27;hp=47c01c7c003a4f7d50a6870c67553ceb93348c9d;hpb=1a931ca854492fce5ea04d7566829f54a0d462cc;p=palacios.git

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index 47c01c7..bdfc8c0 100644
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -136,53 +136,6 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state)
     /******* Setup Host State **********/
 
     /* Cache GDTR, IDTR, and TR in host struct */
-    addr_t gdtr_base;
-    struct {
-        uint16_t selector;
-        addr_t   base;
-    } __attribute__((packed)) tmp_seg;
-    
-
-    __asm__ __volatile__(
-			 "sgdt (%0);"
-			 :
-			 : "q"(&tmp_seg)
-			 : "memory"
-			 );
-    gdtr_base = tmp_seg.base;
-    vmx_state->host_state.gdtr.base = gdtr_base;
-
-    __asm__ __volatile__(
-			 "sidt (%0);"
-			 :
-			 : "q"(&tmp_seg)
-			 : "memory"
-			 );
-    vmx_state->host_state.idtr.base = tmp_seg.base;
-
-    __asm__ __volatile__(
-			 "str (%0);"
-			 :
-			 : "q"(&tmp_seg)
-			 : "memory"
-			 );
-    vmx_state->host_state.tr.selector = tmp_seg.selector;
-
-    /* The GDTR *index* is bits 3-15 of the selector. */
-    struct tss_descriptor * desc = NULL;
-    desc = (struct tss_descriptor *)(gdtr_base + (8 * (tmp_seg.selector >> 3)));
-
-    tmp_seg.base = ((desc->base1) |
-		    (desc->base2 << 16) |
-		    (desc->base3 << 24) |
-#ifdef __V3_64BIT__
-		    ((uint64_t)desc->base4 << 32)
-#else 
-		    (0)
-#endif
-		    );
-
-    vmx_state->host_state.tr.base = tmp_seg.base;
 
 
     /********** Setup VMX Control Fields ***********/
@@ -213,10 +166,6 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state)
 
 
 
-    
-
-
-
 #ifdef __V3_64BIT__
     // Ensure host runs in 64-bit mode at each VM EXIT
     vmx_state->exit_ctrls.host_64_on = 1;
@@ -612,6 +561,14 @@ int v3_vmx_load_core(struct guest_info * core, void * ctx){
 #endif
 
 
+void v3_flush_vmx_vm_core(struct guest_info * core) {
+    struct vmx_data * vmx_info = (struct vmx_data *)(core->vmm_data);
+    vmcs_clear(vmx_info->vmcs_ptr_phys);
+    vmx_info->state = VMX_UNLAUNCHED;
+}
+
+
+
 static int update_irq_exit_state(struct guest_info * info) {
     struct vmx_exit_idt_vec_info idt_vec_info;
 
@@ -860,19 +817,22 @@ int v3_vmx_enter(struct guest_info * info) {
 	ret = v3_vmx_resume(&(info->vm_regs), info, &(info->ctrl_regs));
     }
     
+
+
     //  PrintDebug("VMX Exit: ret=%d\n", ret);
 
     if (ret != VMX_SUCCESS) {
 	uint32_t error = 0;
-
         vmcs_read(VMCS_INSTR_ERR, &error);
 
 	v3_enable_ints();
 
-        PrintError("VMENTRY Error: %d\n", error);
+	PrintError("VMENTRY Error: %d (launch_ret = %d)\n", error, ret);
 	return -1;
     }
 
+
+
     // Immediate exit from VM time bookkeeping
     v3_time_exit_vm(info);