X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=23329eb6abeda984f5f1582fe36dc7f4e31bd8df;hb=5bc39eb312c57576e5d388594563df7dce5aaa2d;hp=010fc76276301b38e8118ed4eb371bd9d7e09a8c;hpb=0899a5c74318e582f3d6ebec52cc744cdb727734;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 010fc76..23329eb 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -29,140 +29,169 @@
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vmm_time.h>
-#include <palacios/vmm_emulator.h>
 #include <palacios/vmm_host_events.h>
-
-
+#include <palacios/vmm_msr.h>
+#include <palacios/vmm_profiler.h>
+#include <palacios/vmm_hypercall.h>
 
 
 
 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 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;
+    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;
+    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 {
-  ushort_t selector;
-  uint_t limit;
-  ullong_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;
-};
+    ushort_t selector;
+    uint_t limit;
+    ullong_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;
+} __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;
+    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;
 };
 
 struct shadow_page_state;
-struct shadow_map;
-struct vmm_io_map;
-struct emulation_state;
 struct v3_intr_state;
+struct v3_profiler;
 
 
 
-typedef enum {SHADOW_PAGING, NESTED_PAGING} v3_paging_mode_t;
-typedef enum {VM_RUNNING, VM_STOPPED, VM_SUSPENDED, VM_ERROR, VM_EMULATING} v3_vm_operating_mode_t;
 
+struct guest_info {
+    ullong_t rip;
 
-typedef enum {REAL, /*UNREAL,*/ PROTECTED, PROTECTED_PAE, LONG, LONG_32_COMPAT, LONG_16_COMPAT} v3_vm_cpu_mode_t;
-typedef enum {PHYSICAL_MEM, VIRTUAL_MEM} v3_vm_mem_mode_t;
+    uint_t cpl;
 
+    addr_t mem_size; // In bytes for now
+    v3_shdw_map_t mem_map;
 
 
-struct guest_info {
-  ullong_t rip;
+    struct vm_time time_state;
 
-  uint_t cpl;
+  
+    v3_paging_mode_t shdw_pg_mode;
+    struct shadow_page_state shdw_pg_state;
+    addr_t direct_map_pt;
+    // nested_paging_t nested_page_state;
 
-  struct shadow_map mem_map;
 
-  struct vm_time time_state;
-  
-  v3_paging_mode_t shdw_pg_mode;
-  struct shadow_page_state shdw_pg_state;
-  addr_t direct_map_pt;
-  // nested_paging_t nested_page_state;
+    // This structure is how we get interrupts for the guest
+    struct v3_intr_state intr_state;
 
+    v3_io_map_t io_map;
 
-  // This structure is how we get interrupts for the guest
-  struct v3_intr_state intr_state;
+    struct v3_msr_map msr_map;
 
-  struct vmm_io_map io_map;
-  // device_map
 
-  struct vmm_dev_mgr  dev_mgr;
+    v3_hypercall_map_t hcall_map;
 
-  struct v3_host_events host_event_hooks;
+    // device_map
+    struct vmm_dev_mgr  dev_mgr;
 
-  v3_vm_cpu_mode_t cpu_mode;
-  v3_vm_mem_mode_t mem_mode;
+    struct v3_host_events host_event_hooks;
 
+    v3_vm_cpu_mode_t cpu_mode;
+    v3_vm_mem_mode_t mem_mode;
+    uint_t addr_width;
 
-  struct v3_gprs vm_regs;
-  struct v3_ctrl_regs ctrl_regs;
-  struct v3_dbg_regs dbg_regs;
-  struct v3_segments segments;
 
-  struct emulation_state emulator;
+    struct v3_gprs vm_regs;
+    struct v3_ctrl_regs ctrl_regs;
+    struct v3_dbg_regs dbg_regs;
+    struct v3_segments segments;
 
-  v3_vm_operating_mode_t run_state;
-  void * vmm_data;
+    v3_vm_operating_mode_t run_state;
+    void * vmm_data;
+
+
+    uint_t enable_profiler;
+    struct v3_profiler profiler;
+
+    void * decoder_state;
+
+    v3_msr_t guest_efer;
+
+    /* Do we need these ? */
+    v3_msr_t guest_star;
+    v3_msr_t guest_lstar;
+    v3_msr_t guest_cstar;
+    v3_msr_t guest_syscall_mask;
+    v3_msr_t guest_gs_base;
+
+
+    //uint64_t fs;
+    //uint64_t gs;
 
-  /* TEMP */
-  //ullong_t exit_tsc;
 
 };
 
 
+uint_t v3_get_addr_width(struct guest_info * info);
 v3_vm_cpu_mode_t v3_get_cpu_mode(struct guest_info * info);
 v3_vm_mem_mode_t v3_get_mem_mode(struct guest_info * info);
 
 
+const uchar_t * v3_cpu_mode_to_str(v3_vm_cpu_mode_t mode);
+const uchar_t * v3_mem_mode_to_str(v3_vm_mem_mode_t mode);
+
+
 void v3_print_segments(struct guest_info * info);
 void v3_print_ctrl_regs(struct guest_info * info);
 void v3_print_GPRs(struct guest_info * info);