Added barrier locking to the core migration functionality

[palacios.git] / palacios / include / palacios / vm_guest.h

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 5792543..1ff5899 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -37,7 +37,7 @@
 #include <palacios/vmm_cpuid.h>
 #include <palacios/vmm_regs.h>
 #include <palacios/vmm_extensions.h>
-
+#include <palacios/vmm_barrier.h>
 
 
 #ifdef V3_CONFIG_TELEMETRY
@@ -50,11 +50,6 @@
 struct v3_sym_core_state;
 #endif
 
-#ifdef V3_CONFIG_SYSCALL_HIJACK
-#include <palacios/vmm_syscall_hijack.h>
-#include <palacios/vmm_execve_hook.h>
-#endif
-
 
 
 #include <palacios/vmm_config.h>
@@ -95,12 +90,6 @@ struct guest_info {
     /* This structure is how we get exceptions for the guest */
     struct v3_excp_state excp_state;
 
-#ifdef V3_CONFIG_SYSCALL_HIJACK
-    struct v3_syscall_hook_map sc_hook_map;
-    struct v3_execve_varchunk var_dump;
-    struct v3_exec_hooks exec_hooks;
-#endif
-
 
     v3_cpu_mode_t cpu_mode;
     v3_mem_mode_t mem_mode;
@@ -139,6 +128,8 @@ struct guest_info {
 
     v3_core_operating_mode_t core_run_state;
 
+    void * core_thread; /* thread struct for virtual core */
+
     /* the logical cpu on which this core runs */
     uint32_t pcpu_id;
     
@@ -181,7 +172,7 @@ struct v3_vm_info {
 
     v3_vm_operating_mode_t run_state;
 
-
+    struct v3_barrier barrier;
 
 
     struct v3_extensions extensions;