Now correctly boots 2, 4, 8 core kitten

[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 24fe22d..b13f462 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -24,6 +24,7 @@
 
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_mem.h>
+#include <palacios/vmm_mem_hook.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_shadow_paging.h>
 #include <palacios/vmm_intr.h>
@@ -34,114 +35,26 @@
 #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>
-#endif
-
-
-
-
-
-
-
-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;
-
-    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));
-
-
-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;
-};
-
-
-
-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;
-};
-
-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;
-};
-
 
 #ifdef CONFIG_SYMBIOTIC
-#include <palacios/vmm_sym_iface.h>
+#include <palacios/vmm_symbiotic.h>
+struct v3_sym_core_state;
 #endif
 
 #include <palacios/vmm_config.h>
 
-struct shadow_page_state;
 struct v3_intr_state;
 
 
-#ifdef CONFIG_SYMBIOTIC_SWAP
-struct v3_sym_swap_state;
-#endif
-
-#ifdef CONFIG_SYMBIOTIC
-struct v3_sym_state;
-#endif
 
 
+/* per-core state */
 struct guest_info {
     uint64_t rip;
 
@@ -150,7 +63,7 @@ struct guest_info {
     struct vm_time time_state;
 
     v3_paging_mode_t shdw_pg_mode;
-    struct shadow_page_state shdw_pg_state;
+    struct v3_shdw_pg_state shdw_pg_state;
     addr_t direct_map_pt;
 
 
@@ -186,21 +99,30 @@ struct guest_info {
 
     void * decoder_state;
 
+#ifdef CONFIG_SYMBIOTIC
+    // Symbiotic state
+    struct v3_sym_core_state sym_core_state;
+#endif
+
 
     struct v3_vm_info * vm_info;
-    // the logical cpu this guest context is executing on
-    int cpu_id;
-};
 
+    // the logical cpu on which this core runs
+    uint32_t cpu_id;
+};
 
 
 
+/* shared state across cores */
 struct v3_vm_info {
     v3_vm_class_t vm_class;
 
     addr_t mem_size; // In bytes for now
     struct v3_mem_map mem_map;
 
+    struct v3_mem_hooks mem_hooks;
+
+    struct v3_shdw_impl_state shdw_impl;
 
     struct v3_io_map io_map;
     struct v3_msr_map msr_map;
@@ -221,10 +143,7 @@ struct v3_vm_info {
 
 #ifdef CONFIG_SYMBIOTIC
     // Symbiotic state
-    struct v3_sym_state sym_state;
-#ifdef CONFIG_SYMBIOTIC_SWAP
-    struct v3_sym_swap_state swap_state;
-#endif
+    struct v3_sym_vm_state sym_vm_state;
 #endif
 
 
@@ -241,8 +160,8 @@ struct v3_vm_info {
 
 };
 
-
-
+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);