X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=74e986e0e84874bf261b22662e4399e58a583a6a;hb=18aca3554039ac4b38e4e7991eacf41960d81e51;hp=eb67f2b719e8edf06345a276164bf3a262dd5215;hpb=da0f0deecf22754656bad2a95640461ec3ac4f1d;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index eb67f2b..74e986e 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -32,6 +32,7 @@
 #include <palacios/vmm_emulator.h>
 #include <palacios/vmm_host_events.h>
 #include <palacios/vmm_msr.h>
+#include <palacios/vmm_profiler.h>
 
 
 
@@ -80,7 +81,7 @@ struct v3_segment {
   uint_t long_mode      : 1;
   uint_t db             : 1;
   uint_t granularity    : 1;
-};
+} __attribute__((packed));
 
 
 struct v3_segments {
@@ -94,14 +95,12 @@ struct v3_segments {
   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;
 
 
 
@@ -112,7 +111,8 @@ struct guest_info {
   uint_t cpl;
 
   addr_t mem_size; // Probably in bytes for now....
-  struct shadow_map mem_map;
+  v3_shdw_map_t mem_map;
+
 
   struct vm_time time_state;
 
@@ -126,7 +126,7 @@ struct guest_info {
   // This structure is how we get interrupts for the guest
   struct v3_intr_state intr_state;
 
-  struct vmm_io_map io_map;
+  v3_io_map_t io_map;
 
   struct v3_msr_map msr_map;
   // device_map
@@ -148,6 +148,9 @@ struct guest_info {
   void * vmm_data;
 
 
+  uint_t enable_profiler;
+  struct v3_profiler profiler;
+
   void * decoder_state;
 
   struct v3_msr guest_efer;