X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=041b75509547ee8531e1fbff975c31c8c6ff8035;hb=b1f2d60bdd24fb6f758ad049c0a6859966a38955;hp=7b849d3cbf0f87f14932a24ab235e8cc9538e2f4;hpb=cfcc5717f659b3ed2954f41cf363d3bceae8dc84;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 7b849d3..041b755 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -34,195 +34,132 @@
 #include <palacios/vmm_msr.h>
 #include <palacios/vmm_hypercall.h>
 #include <palacios/vmm_cpuid.h>
-
+#include <palacios/vmm_regs.h>
 
 #ifdef CONFIG_TELEMETRY
 #include <palacios/vmm_telemetry.h>
 #endif
 
-#ifdef CONFIG_SYMBIOTIC_SWAP
-#include <palacios/vmm_sym_swap.h>
+
+#ifdef CONFIG_SYMBIOTIC
+#include <palacios/vmm_symbiotic.h>
+struct v3_sym_core_state;
 #endif
 
+#include <palacios/vmm_config.h>
 
+struct v3_intr_state;
 
 
 
 
 
-struct v3_gprs {
-    v3_reg_t rdi;
-    v3_reg_t rsi;
-    v3_reg_t rbp;
-    v3_reg_t rsp;
-    v3_reg_t rbx;
-    v3_reg_t rdx;
-    v3_reg_t rcx;
-    v3_reg_t rax;
+struct guest_info {
+    uint64_t rip;
 
-    v3_reg_t r8;
-    v3_reg_t r9;
-    v3_reg_t r10;
-    v3_reg_t r11;
-    v3_reg_t r12;
-    v3_reg_t r13;
-    v3_reg_t r14;
-    v3_reg_t r15;
-  
-} __attribute__((packed));
+    uint_t cpl;
 
+    struct vm_time time_state;
 
-struct v3_ctrl_regs {
-    v3_reg_t cr0;
-    v3_reg_t cr2;
-    v3_reg_t cr3;
-    v3_reg_t cr4;
-    v3_reg_t cr8;
-    v3_reg_t rflags;
-    v3_reg_t efer;
-};
+    v3_paging_mode_t shdw_pg_mode;
+    struct v3_shdw_pg_state shdw_pg_state;
+    addr_t direct_map_pt;
 
 
+    // This structure is how we get interrupts for the guest
+    struct v3_intr_core_state intr_core_state;
 
-struct v3_dbg_regs {
-    v3_reg_t dr0;
-    v3_reg_t dr1;
-    v3_reg_t dr2;
-    v3_reg_t dr3;
-    v3_reg_t dr6;
-    v3_reg_t dr7;
-};
+    // This structure is how we get exceptions for the guest
+    struct v3_excp_state excp_state;
 
-struct v3_segment {
-    uint16_t selector;
-    uint_t limit;
-    uint64_t base;
-    uint_t type           : 4;
-    uint_t system         : 1;
-    uint_t dpl            : 2;
-    uint_t present        : 1;
-    uint_t avail          : 1;
-    uint_t long_mode      : 1;
-    uint_t db             : 1;
-    uint_t granularity    : 1;
-    uint_t unusable       : 1;
-} __attribute__((packed));
-
-
-struct v3_segments {
-    struct v3_segment cs;
-    struct v3_segment ds;
-    struct v3_segment es;
-    struct v3_segment fs;
-    struct v3_segment gs;
-    struct v3_segment ss;
-    struct v3_segment ldtr;
-    struct v3_segment gdtr;
-    struct v3_segment idtr;
-    struct v3_segment tr;
-};
 
+    v3_cpu_mode_t cpu_mode;
+    v3_mem_mode_t mem_mode;
+    uint_t addr_width;
 
-#ifdef CONFIG_SYMBIOTIC
-#include <palacios/vmm_sym_iface.h>
-#endif
+    struct v3_gprs vm_regs;
+    struct v3_ctrl_regs ctrl_regs;
+    struct v3_dbg_regs dbg_regs;
+    struct v3_segments segments;
 
-#include <palacios/vmm_config.h>
 
-struct shadow_page_state;
-struct v3_intr_state;
+    void * vmm_data;
+
+    uint64_t yield_start_cycle;
+    
+    uint64_t num_exits;
 
 #ifdef CONFIG_TELEMETRY
-struct v3_telemetry;
+    struct v3_core_telemetry core_telem;
 #endif
 
-#ifdef CONFIG_SYMBIOTIC_SWAP
-struct v3_sym_swap_state;
-#endif
+
+    // struct v3_core_dev_mgr core_dev_mgr;
+
+    void * decoder_state;
 
 #ifdef CONFIG_SYMBIOTIC
-struct v3_sym_state;
+    // Symbiotic state
+    struct v3_sym_core_state sym_core_state;
 #endif
 
-struct guest_info {
-    uint64_t rip;
 
-    uint_t cpl;
+    struct v3_vm_info * vm_info;
+    // the logical cpu this guest context is executing on
+    int cpu_id;
+};
 
-    addr_t mem_size; // In bytes for now
-    v3_shdw_map_t mem_map;
 
-    struct v3_config * cfg_data;
-    v3_vm_class_t vm_class;
 
-    struct vm_time time_state;
 
-  
-    v3_paging_mode_t shdw_pg_mode;
-    struct shadow_page_state shdw_pg_state;
-    addr_t direct_map_pt;
+struct v3_vm_info {
+    v3_vm_class_t vm_class;
 
+    addr_t mem_size; // In bytes for now
+    struct v3_mem_map mem_map;
 
-    // This structure is how we get interrupts for the guest
-    struct v3_intr_state intr_state;
 
-    // This structure is how we get exceptions for the guest
-    struct v3_excp_state excp_state;
+    struct v3_shdw_impl_state shdw_impl;
 
     struct v3_io_map io_map;
-
     struct v3_msr_map msr_map;
-
     struct v3_cpuid_map cpuid_map;
 
-#ifdef CONFIG_SYMBIOTIC
-    // Symbiotic state
-    struct v3_sym_state sym_state;
-
-#ifdef CONFIG_SYMBIOTIC_SWAP
-    struct v3_sym_swap_state swap_state;
-#endif
-#endif
-
     v3_hypercall_map_t hcall_map;
 
+
+    struct v3_intr_routers intr_routers;
     // device_map
     struct vmm_dev_mgr  dev_mgr;
 
     struct v3_host_events host_event_hooks;
 
-    v3_cpu_mode_t cpu_mode;
-    v3_mem_mode_t mem_mode;
-    uint_t addr_width;
+    struct v3_config * cfg_data;
 
+    v3_vm_operating_mode_t run_state;
 
-    struct v3_gprs vm_regs;
-    struct v3_ctrl_regs ctrl_regs;
-    struct v3_dbg_regs dbg_regs;
-    struct v3_segments segments;
+#ifdef CONFIG_SYMBIOTIC
+    // Symbiotic state
+    struct v3_sym_vm_state sym_vm_state;
+#endif
 
-    v3_vm_operating_mode_t run_state;
-    void * vmm_data;
 
-    uint64_t yield_cycle_period;
-    uint64_t yield_start_cycle;
-    
-    uint64_t num_exits;
 
 #ifdef CONFIG_TELEMETRY
     uint_t enable_telemetry;
     struct v3_telemetry_state telemetry;
 #endif
 
+    uint64_t yield_cycle_period;  
 
+    int num_cores;
+    struct guest_info cores[0];
 
-
-    void * decoder_state;
-
-    // the logical cpu this guest context is executing on
-    int cpu_id;
 };
 
+int v3_init_vm(struct v3_vm_info * vm);
+int v3_init_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);