X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=72f980cbdddf8b21de0acbd133932b45354d271b;hb=603f73496c7025fc3929f209fd4185627370751c;hp=6f40a87d304d58812e2ab5ac531074786fd6be18;hpb=840d15c3a300636e758fcfcf403ae415ffa67816;p=palacios.releases.git

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index 6f40a87..72f980c 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) {
@@ -326,6 +321,14 @@ void v3_print_guest_state(struct guest_info * info) {
 
     V3_Print("NumExits: %u\n", (uint32_t)info->num_exits);
 
+    V3_Print("IRQ STATE: started=%d, pending=%d\n", 
+	     info->intr_core_state.irq_started, 
+	     info->intr_core_state.irq_pending);
+    V3_Print("EXCP STATE: err_code_valid=%d, err_code=%x\n", 
+	     info->excp_state.excp_error_code_valid, 
+	     info->excp_state.excp_error_code);
+
+
     v3_print_segments(&(info->segments));
     v3_print_ctrl_regs(info);
 
@@ -544,6 +547,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 +647,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,12 +692,6 @@ int v3_init_core(struct guest_info * core) {
     v3_init_symbiotic_core(core);
 #endif
 
-// KCH
-#ifdef V3_CONFIG_SYSCALL_HIJACK
-    v3_init_exec_hooks(core);
-    v3_init_mpi_accel(core);
-#endif  
-
     // init SVM/VMX