X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=1ff5899d62cdaa7aed3efc9d6b7a4df0ddd1bada;hb=6ee36e0a7e4585bd0e4235eeb60644fffe230af3;hp=b13f462d31805a8166c9154dfb2cf84aa702a2f4;hpb=d25220596e7ceb6b06a4b715f722a47afd8b48bb;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index b13f462..1ff5899 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -36,17 +36,22 @@
 #include <palacios/vmm_hypercall.h>
 #include <palacios/vmm_cpuid.h>
 #include <palacios/vmm_regs.h>
+#include <palacios/vmm_extensions.h>
+#include <palacios/vmm_barrier.h>
 
-#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
 
+
+
 #include <palacios/vmm_config.h>
 
 struct v3_intr_state;
@@ -56,6 +61,8 @@ struct v3_intr_state;
 
 /* per-core state */
 struct guest_info {
+    char exec_name[256];
+    
     uint64_t rip;
 
     uint_t cpl;
@@ -65,18 +72,28 @@ struct guest_info {
     v3_paging_mode_t shdw_pg_mode;
     struct v3_shdw_pg_state shdw_pg_state;
     addr_t direct_map_pt;
+    
+
+    union {
+	uint32_t flags;
+	struct {
+	    uint8_t use_large_pages        : 1;    /* Enable virtual page tables to use large pages */
+	    uint8_t use_giant_pages        : 1;    /* Enable virtual page tables to use giant (1GB) pages */
+	    uint32_t rsvd                  : 30;
+	} __attribute__((packed));
+    } __attribute__((packed));
 
 
-    // This structure is how we get interrupts for the guest
+    /* This structure is how we get interrupts for the guest */
     struct v3_intr_core_state intr_core_state;
 
-    // This structure is how we get exceptions for the guest
+    /* This structure is how we get exceptions for the guest */
     struct v3_excp_state excp_state;
 
 
     v3_cpu_mode_t cpu_mode;
     v3_mem_mode_t mem_mode;
-    uint_t addr_width;
+
 
     struct v3_gprs vm_regs;
     struct v3_ctrl_regs ctrl_regs;
@@ -90,34 +107,47 @@ struct guest_info {
     
     uint64_t num_exits;
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
     struct v3_core_telemetry core_telem;
 #endif
 
 
-    // struct v3_core_dev_mgr core_dev_mgr;
+    /* struct v3_core_dev_mgr core_dev_mgr; */
 
     void * decoder_state;
 
-#ifdef CONFIG_SYMBIOTIC
-    // Symbiotic state
+#ifdef V3_CONFIG_SYMBIOTIC
+    /* Symbiotic state */
     struct v3_sym_core_state sym_core_state;
 #endif
 
+    /* Per-core config tree data. */
+    v3_cfg_tree_t * core_cfg_data;
 
     struct v3_vm_info * vm_info;
 
-    // the logical cpu on which this core runs
-    uint32_t cpu_id;
+    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;
+    
+    /* The virtual core # of this cpu (what the guest sees this core as) */
+    uint32_t vcpu_id;
+     
 };
 
 
 
 /* shared state across cores */
 struct v3_vm_info {
+    char name[128];
+
     v3_vm_class_t vm_class;
 
-    addr_t mem_size; // In bytes for now
+    addr_t mem_size; /* In bytes for now */
+    uint32_t mem_align;
     struct v3_mem_map mem_map;
 
     struct v3_mem_hooks mem_hooks;
@@ -132,7 +162,8 @@ struct v3_vm_info {
 
 
     struct v3_intr_routers intr_routers;
-    // device_map
+
+    /* device_map */
     struct vmm_dev_mgr  dev_mgr;
 
     struct v3_host_events host_event_hooks;
@@ -141,28 +172,39 @@ struct v3_vm_info {
 
     v3_vm_operating_mode_t run_state;
 
-#ifdef CONFIG_SYMBIOTIC
-    // Symbiotic state
-    struct v3_sym_vm_state sym_vm_state;
-#endif
+    struct v3_barrier barrier;
+
 
+    struct v3_extensions extensions;
 
+#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
 
+
     uint64_t yield_cycle_period;  
 
+
+    void * host_priv_data;
+
     int num_cores;
-    struct guest_info cores[0];
 
+    // JRL: This MUST be the last entry...
+    struct guest_info cores[0];
 };
 
 int v3_init_vm(struct v3_vm_info * vm);
 int v3_init_core(struct guest_info * core);
 
+int v3_free_vm_internal(struct v3_vm_info * vm);
+int v3_free_core(struct guest_info * core);
+
 
 uint_t v3_get_addr_width(struct guest_info * info);
 v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info);
@@ -183,6 +225,8 @@ void v3_print_GPRs(struct guest_info * info);
 
 void v3_print_stack(struct guest_info * info);
 
-#endif // ! __V3VEE__
+#endif /* ! __V3VEE__ */
+
+void v3_print_guest_state_all(struct v3_vm_info * vm);
 
 #endif