X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=1f0293f6d8c277f8e970e16acf6e176a658dea5e;hb=29e825c5f095066bbb5ebbec5a5af1419d883264;hp=0b5f59c76c97fc816a8262aa73e645220a8cfb36;hpb=9b4bfeefac09294a6f0ae12dbadf102eb547f5ec;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 0b5f59c..1f0293f 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -27,6 +27,7 @@
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_shadow_paging.h>
 #include <palacios/vmm_intr.h>
+#include <palacios/vmm_excp.h>
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vmm_time.h>
 #include <palacios/vmm_host_events.h>
@@ -129,13 +130,15 @@ struct guest_info {
     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 exceptions for the guest
+    struct v3_excp_state excp_state;
+
+    struct v3_io_map io_map;
 
     struct v3_msr_map msr_map;
 
@@ -147,8 +150,8 @@ struct guest_info {
 
     struct v3_host_events host_event_hooks;
 
-    v3_vm_cpu_mode_t cpu_mode;
-    v3_vm_mem_mode_t mem_mode;
+    v3_cpu_mode_t cpu_mode;
+    v3_mem_mode_t mem_mode;
     uint_t addr_width;
 
 
@@ -176,21 +179,20 @@ struct guest_info {
     v3_msr_t guest_gs_base;
 
 
-    uint64_t fs;
-    uint64_t gs;
-
+    //uint64_t fs;
+    //uint64_t gs;
 
 
 };
 
 
 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);
+v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info);
+v3_mem_mode_t v3_get_vm_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);
+const uchar_t * v3_cpu_mode_to_str(v3_cpu_mode_t mode);
+const uchar_t * v3_mem_mode_to_str(v3_mem_mode_t mode);
 
 
 void v3_print_segments(struct guest_info * info);