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=908eb287a335f4b5e7b24fd175f7d3ffcff69255;hpb=5b6278751429f59297ce74e614d50632daea3748;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 908eb28..e1a9199 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -35,7 +35,6 @@
 
 
 
-
 struct v3_gprs {
   v3_reg_t rdi;
   v3_reg_t rsi;
@@ -105,13 +104,6 @@ struct v3_intr_state;
 
 
 
-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;
-
-
-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;
-
 
 
 struct guest_info {
@@ -119,9 +111,11 @@ 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;
+
   
   v3_paging_mode_t shdw_pg_mode;
   struct shadow_page_state shdw_pg_state;
@@ -155,6 +149,9 @@ struct guest_info {
   v3_vm_operating_mode_t run_state;
   void * vmm_data;
 
+
+  struct v3_msr guest_efer;
+
   /* TEMP */
   //ullong_t exit_tsc;
 
@@ -165,6 +162,10 @@ 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);