X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=7bd275f77a2aef9c5fa7edacb226c8fb5b8ce853;hb=9a9c14099c09e9ed86d8ac2f73f7406d0ac8a90b;hp=af6b6d44d2b0cfe96b7f82a3803695cf0783b048;hpb=1f9fa9cd9662a600f49a3b12fcc02fd2ffca93c8;p=palacios.git

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index af6b6d4..7bd275f 100644
--- a/palacios/src/palacios/vm_guest.c
+++ b/palacios/src/palacios/vm_guest.c
@@ -30,12 +30,7 @@
 #include <palacios/vmm_sprintf.h>
 #include <palacios/vmm_xed.h>
 #include <palacios/vmm_direct_paging.h>
-
-#ifdef V3_CONFIG_SYSCALL_HIJACK
-#include <palacios/vmm_syscall_hijack.h>
-#include <palacios/vmm_mpi_accel.h>
-#endif
-
+#include <palacios/vmm_barrier.h>
 
 
 v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) {
@@ -544,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");
@@ -642,6 +639,8 @@ 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);
@@ -685,14 +684,6 @@ int v3_init_core(struct guest_info * core) {
     v3_init_symbiotic_core(core);
 #endif
 
-    /*  This is test code for exec hook insertion 
-// KCH
-#ifdef V3_CONFIG_SYSCALL_HIJACK
-    v3_init_exec_hooks(core);
-    v3_init_mpi_accel(core);
-#endif
-    */  
-
     // init SVM/VMX