X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=e1a91997753d0f8da9621fdb6809696b3eccfff6;hb=207e3b36648e4019ad8505c75ae6ef0778464a26;hp=c3a97d80a7f3c0a6f2fd4806419f547d6f0db4a1;hpb=82cceefa66b1f05d8f9d5bfcb2fb7214755e1904;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index c3a97d8..e1a9199 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -17,14 +17,13 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __VM_GUEST_H
-#define __VM_GUEST_H
+#ifndef __VM_GUEST_H__
+#define __VM_GUEST_H__
 
 #ifdef __V3VEE__
 
-
-#include <palacios/vmm_mem.h>
 #include <palacios/vmm_types.h>
+#include <palacios/vmm_mem.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_shadow_paging.h>
 #include <palacios/vmm_intr.h>
@@ -32,8 +31,7 @@
 #include <palacios/vmm_time.h>
 #include <palacios/vmm_emulator.h>
 #include <palacios/vmm_host_events.h>
-
-typedef ullong_t v3_reg_t;
+#include <palacios/vmm_msr.h>
 
 
 
@@ -104,21 +102,8 @@ struct vmm_io_map;
 struct emulation_state;
 struct v3_intr_state;
 
-struct vm_ctrl_ops {
-  int (*raise_irq)(struct guest_info * info, int irq);
-  int (*lower_irq)(struct guest_info * info, int irq);
-};
-
-
-
-
-typedef enum {SHADOW_PAGING, NESTED_PAGING} vmm_paging_mode_t;
-typedef enum {VM_RUNNING, VM_STOPPED, VM_SUSPENDED, VM_ERROR, VM_EMULATING} vm_operating_mode_t;
 
 
-typedef enum {REAL, /*UNREAL,*/ PROTECTED, PROTECTED_PAE, LONG, LONG_32_COMPAT, LONG_16_COMPAT} vm_cpu_mode_t;
-typedef enum {PHYSICAL_MEM, VIRTUAL_MEM} vm_mem_mode_t;
-
 
 
 struct guest_info {
@@ -126,11 +111,13 @@ struct guest_info {
 
   uint_t cpl;
 
+  addr_t mem_size; // Probably in bytes for now....
   struct shadow_map mem_map;
 
   struct vm_time time_state;
+
   
-  vmm_paging_mode_t shdw_pg_mode;
+  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;
@@ -140,14 +127,16 @@ struct guest_info {
   struct v3_intr_state intr_state;
 
   struct vmm_io_map io_map;
+
+  struct v3_msr_map msr_map;
   // device_map
 
   struct vmm_dev_mgr  dev_mgr;
 
   struct v3_host_events host_event_hooks;
 
-  vm_cpu_mode_t cpu_mode;
-  vm_mem_mode_t mem_mode;
+  v3_vm_cpu_mode_t cpu_mode;
+  v3_vm_mem_mode_t mem_mode;
 
 
   struct v3_gprs vm_regs;
@@ -155,26 +144,31 @@ struct guest_info {
   struct v3_dbg_regs dbg_regs;
   struct v3_segments segments;
 
-  struct vm_ctrl_ops vm_ops;
-
   struct emulation_state emulator;
 
-  vm_operating_mode_t run_state;
+  v3_vm_operating_mode_t run_state;
   void * vmm_data;
 
+
+  struct v3_msr guest_efer;
+
   /* TEMP */
   //ullong_t exit_tsc;
 
 };
 
 
-vm_cpu_mode_t get_cpu_mode(struct guest_info * info);
-vm_mem_mode_t get_mem_mode(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 PrintV3Segments(struct guest_info * info);
-void PrintV3CtrlRegs(struct guest_info * info);
-void PrintV3GPRs(struct guest_info * info);
+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);
 
 #endif // ! __V3VEE__