X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=4360a64a34d0a258aa0246896338706e5fe92f95;hb=382829fe58cb541af371547325c5502e37032ecd;hp=b427f5a84062241a8ecf3d3428c77aa2e65182da;hpb=dc6b47d05e37e6c3738e1bc6165ec4a107717d2b;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index b427f5a..4360a64 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -40,20 +40,16 @@
 
 
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
 #include <palacios/vmm_telemetry.h>
 #endif
 
 
-#ifdef CONFIG_SYMBIOTIC
+#ifdef V3_CONFIG_SYMBIOTIC
 #include <palacios/vmm_symbiotic.h>
 struct v3_sym_core_state;
 #endif
 
-#ifdef CONFIG_SYSCALL_HIJACK
-#include <palacios/vmm_syscall_hijack.h>
-#endif
-
 
 
 #include <palacios/vmm_config.h>
@@ -94,11 +90,6 @@ struct guest_info {
     /* This structure is how we get exceptions for the guest */
     struct v3_excp_state excp_state;
 
-#ifdef CONFIG_SYSCALL_HIJACK
-    struct v3_syscall_hook_map sc_hook_map;
-    struct v3_execve_varchunk var_dump;
-#endif
-
 
     v3_cpu_mode_t cpu_mode;
     v3_mem_mode_t mem_mode;
@@ -116,7 +107,7 @@ struct guest_info {
     
     uint64_t num_exits;
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
     struct v3_core_telemetry core_telem;
 #endif
 
@@ -125,7 +116,7 @@ struct guest_info {
 
     void * decoder_state;
 
-#ifdef CONFIG_SYMBIOTIC
+#ifdef V3_CONFIG_SYMBIOTIC
     /* Symbiotic state */
     struct v3_sym_core_state sym_core_state;
 #endif
@@ -138,7 +129,10 @@ struct guest_info {
     v3_core_operating_mode_t core_run_state;
 
     /* the logical cpu on which this core runs */
-    uint32_t cpu_id;
+    uint32_t pcpu_id;
+    
+    /* The virtual core # of this cpu (what the guest sees this core as) */
+    uint32_t vcpu_id;
      
 };
 
@@ -154,8 +148,6 @@ struct v3_vm_info {
     uint32_t mem_align;
     struct v3_mem_map mem_map;
 
-    v3_paging_size_t paging_size; // for nested paging
-
     struct v3_mem_hooks mem_hooks;
 
     struct v3_shdw_impl_state shdw_impl;
@@ -183,12 +175,12 @@ struct v3_vm_info {
 
     struct v3_extensions extensions;
 
-#ifdef CONFIG_SYMBIOTIC
+#ifdef V3_CONFIG_SYMBIOTIC
     /* Symbiotic state */
     struct v3_sym_vm_state sym_vm_state;
 #endif
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
     uint_t enable_telemetry;
     struct v3_telemetry_state telemetry;
 #endif