X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=7bd275f77a2aef9c5fa7edacb226c8fb5b8ce853;hb=c1e5fa51e4f5b7055c677e2f9d5bc9808a32b351;hp=b8cc5498fac65a314d076251a7d39661c08bef19;hpb=374b2d6d22a0e0dc6ed8d3d628e635ab935072e0;p=palacios.git

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index b8cc549..7bd275f 100644
--- a/palacios/src/palacios/vm_guest.c
+++ b/palacios/src/palacios/vm_guest.c
@@ -28,10 +28,9 @@
 #include <palacios/vm_guest_mem.h>
 #include <palacios/vmm_lowlevel.h>
 #include <palacios/vmm_sprintf.h>
-#include <palacios/vmm_muxer.h>
 #include <palacios/vmm_xed.h>
 #include <palacios/vmm_direct_paging.h>
-
+#include <palacios/vmm_barrier.h>
 
 
 v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) {
@@ -488,14 +487,14 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
     v3_print_guest_state(core);
     
     // init SVM/VMX
-#ifdef CONFIG_SVM
+#ifdef V3_CONFIG_SVM
     if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) {
 	cpu_valid = 1;
 	PrintDebugVMCB((vmcb_t *)(core->vmm_data));
     }
 #endif
-#ifdef CONFIG_VMX
-    if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
+#ifdef V3_CONFIG_VMX
+    if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU) || (cpu_type == V3_VMX_EPT_UG_CPU)) {
 	cpu_valid = 1;
 	v3_print_vmcs();
     }
@@ -510,13 +509,13 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
 }
 
 
-#ifdef CONFIG_SVM
+#ifdef V3_CONFIG_SVM
 #include <palacios/svm.h>
 #include <palacios/svm_io.h>
 #include <palacios/svm_msr.h>
 #endif
 
-#ifdef CONFIG_VMX
+#ifdef V3_CONFIG_VMX
 #include <palacios/vmx.h>
 #include <palacios/vmx_io.h>
 #include <palacios/vmx_msr.h>
@@ -526,15 +525,9 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
 int v3_init_vm(struct v3_vm_info * vm) {
     v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU());
 
-    if (v3_get_foreground_vm() == NULL) {
-	v3_set_foreground_vm(vm);
-    }
 
-#ifdef CONFIG_INSPECTOR
-    v3_init_inspector(vm);
-#endif
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
     v3_init_telemetry(vm);
 #endif
 
@@ -546,6 +539,8 @@ int v3_init_vm(struct v3_vm_info * vm) {
     v3_init_intr_routers(vm);
     v3_init_ext_manager(vm);
 
+    v3_init_barrier(vm);
+
     // Initialize the memory map
     if (v3_init_mem_map(vm) == -1) {
 	PrintError("Could not initialize shadow map\n");
@@ -563,7 +558,7 @@ int v3_init_vm(struct v3_vm_info * vm) {
     v3_init_time_vm(vm);
 
 
-#ifdef CONFIG_SYMBIOTIC
+#ifdef V3_CONFIG_SYMBIOTIC
     v3_init_symbiotic_vm(vm);
 #endif
 
@@ -572,16 +567,17 @@ int v3_init_vm(struct v3_vm_info * vm) {
 
     // init SVM/VMX
     switch (cpu_type) {
-#ifdef CONFIG_SVM
+#ifdef V3_CONFIG_SVM
 	case V3_SVM_CPU:
 	case V3_SVM_REV3_CPU:
 	    v3_init_svm_io_map(vm);
 	    v3_init_svm_msr_map(vm);
 	    break;
 #endif
-#ifdef CONFIG_VMX
+#ifdef V3_CONFIG_VMX
 	case V3_VMX_CPU:
 	case V3_VMX_EPT_CPU:
+	case V3_VMX_EPT_UG_CPU:
 	    v3_init_vmx_io_map(vm);
 	    v3_init_vmx_msr_map(vm);
 	    break;
@@ -606,22 +602,23 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
 
 
 
-#ifdef CONFIG_SYMBIOTIC
+#ifdef V3_CONFIG_SYMBIOTIC
     v3_deinit_symbiotic_vm(vm);
 #endif
 
     // init SVM/VMX
     switch (cpu_type) {
-#ifdef CONFIG_SVM
+#ifdef V3_CONFIG_SVM
 	case V3_SVM_CPU:
 	case V3_SVM_REV3_CPU:
 	    v3_deinit_svm_io_map(vm);
 	    v3_deinit_svm_msr_map(vm);
 	    break;
 #endif
-#ifdef CONFIG_VMX
+#ifdef V3_CONFIG_VMX
 	case V3_VMX_CPU:
 	case V3_VMX_EPT_CPU:
+	case V3_VMX_EPT_UG_CPU:
 	    v3_deinit_vmx_io_map(vm);
 	    v3_deinit_vmx_msr_map(vm);
 	    break;
@@ -642,12 +639,14 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
     v3_deinit_intr_routers(vm);
     v3_deinit_host_events(vm);
 
+    v3_deinit_barrier(vm);
+
     v3_deinit_cpuid_map(vm);
     v3_deinit_msr_map(vm);
     v3_deinit_io_map(vm);
     v3_deinit_hypercall_map(vm);
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
     v3_deinit_telemetry(vm);
 #endif
 
@@ -661,14 +660,12 @@ int v3_init_core(struct guest_info * core) {
     v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU());
     struct v3_vm_info * vm = core->vm_info;
 
-#ifdef CONFIG_INSPECTOR
-    v3_init_inspector_core(core);
-#endif
+
 
     /*
      * Initialize the subsystem data strutures
      */
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
     v3_init_core_telemetry(core);
 #endif
 
@@ -683,7 +680,7 @@ int v3_init_core(struct guest_info * core) {
     v3_init_decoder(core);
 
 
-#ifdef CONFIG_SYMBIOTIC
+#ifdef V3_CONFIG_SYMBIOTIC
     v3_init_symbiotic_core(core);
 #endif
 
@@ -691,7 +688,7 @@ int v3_init_core(struct guest_info * core) {
 
 
     switch (cpu_type) {
-#ifdef CONFIG_SVM
+#ifdef V3_CONFIG_SVM
 	case V3_SVM_CPU:
 	case V3_SVM_REV3_CPU:
 	    if (v3_init_svm_vmcb(core, vm->vm_class) == -1) {
@@ -700,9 +697,10 @@ int v3_init_core(struct guest_info * core) {
 	    }
 	    break;
 #endif
-#ifdef CONFIG_VMX
+#ifdef V3_CONFIG_VMX
 	case V3_VMX_CPU:
 	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");
 		return -1;
@@ -723,7 +721,7 @@ int v3_free_core(struct guest_info * core) {
     v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU());
 
     
-#ifdef CONFIG_SYMBIOTIC
+#ifdef V3_CONFIG_SYMBIOTIC
     v3_deinit_symbiotic_core(core);
 #endif
 
@@ -738,12 +736,12 @@ int v3_free_core(struct guest_info * core) {
 
     v3_free_passthrough_pts(core);
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
     v3_deinit_core_telemetry(core);
 #endif
 
     switch (cpu_type) {
-#ifdef CONFIG_SVM
+#ifdef V3_CONFIG_SVM
 	case V3_SVM_CPU:
 	case V3_SVM_REV3_CPU:
 	    if (v3_deinit_svm_vmcb(core) == -1) {
@@ -752,9 +750,10 @@ int v3_free_core(struct guest_info * core) {
 	    }
 	    break;
 #endif
-#ifdef CONFIG_VMX
+#ifdef V3_CONFIG_VMX
 	case V3_VMX_CPU:
 	case V3_VMX_EPT_CPU:
+	case V3_VMX_EPT_UG_CPU:
 	    if (v3_deinit_vmx_vmcs(core) == -1) {
 		PrintError("Error in VMX initialization\n");
 		return -1;