X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx_assist.c;h=75f27746d5ed7fa0efa63b6cd053a90f86c1fd64;hb=cfcceed5890430afedcc544bd7dbb69e29dfd65a;hp=8a12fe7f772a24292d7f5e305753599277a2d26d;hpb=61597ea2c5ccace036d8a65e429e32b8f8a7ed4a;p=palacios.git

diff --git a/palacios/src/palacios/vmx_assist.c b/palacios/src/palacios/vmx_assist.c
index 8a12fe7..75f2774 100644
--- a/palacios/src/palacios/vmx_assist.c
+++ b/palacios/src/palacios/vmx_assist.c
@@ -26,64 +26,58 @@ static int vmx_save_world_ctx(struct guest_info * info, struct vmx_assist_contex
 static int vmx_restore_world_ctx(struct guest_info * info, struct vmx_assist_context * ctx);
 
 int v3_vmxassist_ctx_switch(struct guest_info * info) {
-    uint32_t vmx_magic = 0; // Magic number to check for vmxassist
     struct vmx_assist_context * old_ctx = NULL;
-    struct vmx_assist_context * new_ctx = NULL;	
-    uint32_t old_ctx_gpa = 0;
-    uint32_t new_ctx_gpa = 0;
-    vmx_state_t state = ((struct vmx_data *)info->vmm_data)->state;
-
-    /* Check validity of VMXASSIST_MAGIC field */
-    if (read_guest_pa_memory(info, VMXASSIST_MAGIC_OFFSET, sizeof(vmx_magic), (uint8_t *)&vmx_magic) != sizeof(vmx_magic)) {
-	PrintError("Could not read guest VMXASSIST magic field\n");
-	return -1;
+    struct vmx_assist_context * new_ctx = NULL;
+    struct vmx_assist_header * hdr = NULL;
+    struct vmx_data * vmx_info = (struct vmx_data *)info->vmm_data;
+ 
+
+
+    if (guest_pa_to_host_va(info, VMXASSIST_BASE, (addr_t *)&hdr) == -1) {
+        PrintError("Could not translate address for vmxassist header\n");
+        return -1;
     }
 
-    if (vmx_magic != VMXASSIST_MAGIC) {
-	PrintError("VMXASSIT_MAGIC field is invalid\n");
+    if (hdr->magic != VMXASSIST_MAGIC) {
+        PrintError("VMXASSIST_MAGIC field is invalid\n");
         return -1;
     }
 
 
-    /* Retrieve the pointer to the Old Context struct */
-    if (read_guest_pa_memory(info, VMXASSIST_OLD_CONTEXT, sizeof(old_ctx_gpa), (uint8_t *)&old_ctx_gpa) != sizeof(old_ctx_gpa)) {
-	PrintError("Could not read Old Context pointer field\n");
-	return -1;
-    }
-    
-    guest_pa_to_host_va(info, (addr_t)old_ctx_gpa, (addr_t *)&(old_ctx));
-    
-
-    /* Retrieve the pointer to the New Context struct */
-    if (read_guest_pa_memory(info, VMXASSIST_NEW_CONTEXT, sizeof(new_ctx_gpa), (uint8_t *)&new_ctx_gpa) != sizeof(new_ctx_gpa)) {
-	PrintError("Could not read New Context pointer field\n");
-	return -1;
+    if (guest_pa_to_host_va(info, (addr_t)(hdr->old_ctx_gpa), (addr_t *)&(old_ctx)) == -1) {
+        PrintError("Could not translate address for VMXASSIST old context\n");
+        return -1;
     }
-    
-    guest_pa_to_host_va(info, (addr_t)new_ctx_gpa, (addr_t *)&(new_ctx));
-    
-
 
-    if (state == VMXASSIST_DISABLED) {
+    if (guest_pa_to_host_va(info, (addr_t)(hdr->new_ctx_gpa), (addr_t *)&(new_ctx)) == -1) {
+        PrintError("Could not translate address for VMXASSIST new context\n");
+        return -1;
+    }
 
-	/* Save the old Context */
+    if (vmx_info->state == VMXASSIST_DISABLED) {
+        
+        /* Save the old Context */
         if (vmx_save_world_ctx(info, old_ctx) != 0) {
-	    PrintError("Could not save VMXASSIST world context\n");
+            PrintError("Could not save VMXASSIST world context\n");
             return -1;
-	}
+        }
 
         /* restore new context, vmxassist should launch the bios the first time */
         if (vmx_restore_world_ctx(info, new_ctx) != 0) {
-	    PrintError("VMXASSIST could not restore new context\n");
+            PrintError("VMXASSIST could not restore new context\n");
             return -1;
-	}
+        }
 
-    } else if (state == VMXASSIST_ENABLED) {
+        vmx_info->state = VMXASSIST_ENABLED;
+
+    } else if (vmx_info->state == VMXASSIST_ENABLED) {
         /* restore old context */
         if (vmx_restore_world_ctx(info, old_ctx) != 0) {
-	    PrintError("VMXASSIST could not restore old context\n");
+            PrintError("VMXASSIST could not restore old context\n");
             return -1;
-	}
+        }
+
+        vmx_info->state = VMXASSIST_DISABLED;
     }
 
     return 0;