X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=48f0d8a40add2f42408d9fa179062711735e023e;hb=2fff50d3e72abf29655326449ed4dc5cf6e8f429;hp=d94d465eb7b55c2a1df3a8e1c1e4488d08588ef7;hpb=e8069ad305c7b50fefb0cc602d9ca53324e6cc9e;p=palacios.git

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index d94d465..48f0d8a 100644
--- a/palacios/src/palacios/vm_guest.c
+++ b/palacios/src/palacios/vm_guest.c
@@ -48,8 +48,8 @@ v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) {
 	cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
 	efer = (struct efer_64 *)&(info->ctrl_regs.efer);
     } else {
-	PrintError("Invalid Paging Mode...\n");
-	V3_ASSERT(0);
+        PrintError(info->vm_info, info, "Invalid Paging Mode...\n");
+	V3_ASSERT(info->vm_info, info, 0);
 	return -1;
     }
 
@@ -82,8 +82,8 @@ uint_t v3_get_addr_width(struct guest_info * info) {
 	cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
 	efer = (struct efer_64 *)&(info->ctrl_regs.efer);
     } else {
-	PrintError("Invalid Paging Mode...\n");
-	V3_ASSERT(0);
+        PrintError(info->vm_info, info, "Invalid Paging Mode...\n");
+	V3_ASSERT(info->vm_info, info, 0);
 	return -1;
     }
 
@@ -136,8 +136,8 @@ v3_mem_mode_t v3_get_vm_mem_mode(struct guest_info * info) {
     } else if (info->shdw_pg_mode == NESTED_PAGING) {
 	cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
     } else {
-	PrintError("Invalid Paging Mode...\n");
-	V3_ASSERT(0);
+	PrintError(info->vm_info, info, "Invalid Paging Mode...\n");
+	V3_ASSERT(info->vm_info, info, 0);
 	return -1;
     }
 
@@ -174,7 +174,7 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
     extern v3_cpu_arch_t v3_mach_type;
     int cpu_valid = 0;
 
-    V3_Print("************** Guest State ************\n");
+    V3_Print(core->vm_info, core, "************** Guest State ************\n");
     v3_print_guest_state(core);
     
     // init SVM/VMX
@@ -191,7 +191,7 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
     }
 #endif
     if (!cpu_valid) {
-	PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+	PrintError(core->vm_info, core, "Invalid CPU Type 0x%x\n", v3_mach_type);
 	return -1;
     }
     
@@ -211,6 +211,7 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
 #include <palacios/vmx.h>
 #include <palacios/vmx_io.h>
 #include <palacios/vmx_msr.h>
+#include <palacios/vmx_exits.h>
 #endif
 
 
@@ -237,14 +238,14 @@ int v3_init_vm(struct v3_vm_info * vm) {
 
     // Initialize the memory map
     if (v3_init_mem_map(vm) == -1) {
-	PrintError("Could not initialize shadow map\n");
+        PrintError(vm, VCORE_NONE, "Could not initialize shadow map\n");
 	return -1;
     }
 
     v3_init_mem_hooks(vm);
 
     if (v3_init_shdw_impl(vm) == -1) {
-	PrintError("VM initialization error in shadow implementaion\n");
+        PrintError(vm, VCORE_NONE, "VM initialization error in shadow implementaion\n");
 	return -1;
     }
 
@@ -277,16 +278,17 @@ int v3_init_vm(struct v3_vm_info * vm) {
 	case V3_VMX_EPT_UG_CPU:
 	    v3_init_vmx_io_map(vm);
 	    v3_init_vmx_msr_map(vm);
+	    v3_init_vmx_exits(vm);
 	    break;
 #endif
 	default:
-	    PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+   	    PrintError(vm, VCORE_NONE, "Invalid CPU Type 0x%x\n", v3_mach_type);
 	    return -1;
     }
     
     v3_register_hypercall(vm, GUEST_INFO_HCALL, info_hcall, NULL);
 
-    V3_Print("GUEST_INFO_HCALL=%x\n", GUEST_INFO_HCALL);
+    V3_Print(vm, VCORE_NONE, "GUEST_INFO_HCALL=%x\n", GUEST_INFO_HCALL);
 
     return 0;
 }
@@ -321,7 +323,7 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
 	    break;
 #endif
 	default:
-	    PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+  	    PrintError(vm, VCORE_NONE, "Invalid CPU Type 0x%x\n", v3_mach_type);
 	    return -1;
     }
 
@@ -393,7 +395,7 @@ int v3_init_core(struct guest_info * core) {
 	case V3_SVM_CPU:
 	case V3_SVM_REV3_CPU:
 	    if (v3_init_svm_vmcb(core, vm->vm_class) == -1) {
-		PrintError("Error in SVM initialization\n");
+	        PrintError(vm, core, "Error in SVM initialization\n");
 		return -1;
 	    }
 	    break;
@@ -403,13 +405,13 @@ int v3_init_core(struct guest_info * core) {
 	case V3_VMX_EPT_CPU:
 	case V3_VMX_EPT_UG_CPU:
 	    if (v3_init_vmx_vmcs(core, vm->vm_class) == -1) {
-		PrintError("Error in VMX initialization\n");
+  	        PrintError(vm, core, "Error in VMX initialization\n");
 		return -1;
 	    }
 	    break;
 #endif
 	default:
-	    PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+            PrintError(vm, core, "Invalid CPU Type 0x%x\n", v3_mach_type);
 	    return -1;
     }
     
@@ -449,7 +451,7 @@ int v3_free_core(struct guest_info * core) {
 	case V3_SVM_CPU:
 	case V3_SVM_REV3_CPU:
 	    if (v3_deinit_svm_vmcb(core) == -1) {
-		PrintError("Error in SVM initialization\n");
+  	        PrintError(VM_NONE,VCORE_NONE, "Error in SVM deinitialization\n");
 		return -1;
 	    }
 	    break;
@@ -459,13 +461,13 @@ int v3_free_core(struct guest_info * core) {
 	case V3_VMX_EPT_CPU:
 	case V3_VMX_EPT_UG_CPU:
 	    if (v3_deinit_vmx_vmcs(core) == -1) {
-		PrintError("Error in VMX initialization\n");
+	        PrintError(VM_NONE, VCORE_NONE, "Error in VMX initialization\n");
 		return -1;
 	    }
 	    break;
 #endif
 	default:
-	    PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+  	    PrintError(core->vm_info, core, "Invalid CPU Type 0x%x\n", v3_mach_type);
 	    return -1;
     }