New keyed stream interface

[palacios.git] / palacios / include / palacios / vm_guest.h

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 49e8598..5e18244 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -39,7 +39,10 @@
 #include <palacios/vmm_extensions.h>
 #include <palacios/vmm_barrier.h>
 #include <palacios/vmm_timeout.h>
+#include <palacios/vmm_exits.h>
+#include <palacios/vmm_events.h>
 
+#include <palacios/vmm_perftune.h>
 
 #ifdef V3_CONFIG_TELEMETRY
 #include <palacios/vmm_telemetry.h>
@@ -138,7 +141,7 @@ struct guest_info {
     
     /* The virtual core # of this cpu (what the guest sees this core as) */
     uint32_t vcpu_id;
-     
+
 };
 
 
@@ -160,6 +163,8 @@ struct v3_vm_info {
     struct v3_io_map io_map;
     struct v3_msr_map msr_map;
     struct v3_cpuid_map cpuid_map;
+    struct v3_exit_map exit_map;
+    struct v3_event_map event_map;
 
     v3_hypercall_map_t hcall_map;
 
@@ -182,6 +187,8 @@ struct v3_vm_info {
 
     struct v3_extensions extensions;
 
+    struct v3_perf_options perf_options;
+
 #ifdef V3_CONFIG_SYMBIOTIC
     /* Symbiotic state */
     struct v3_sym_vm_state sym_vm_state;
@@ -219,19 +226,10 @@ v3_mem_mode_t v3_get_vm_mem_mode(struct guest_info * info);
 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);
 
-int v3_translate_segment(struct guest_info * info, uint16_t selector, struct v3_segment * seg);
-
 
-void v3_print_guest_state(struct guest_info * info);
-
-void v3_print_segments(struct v3_segments * segs);
-void v3_print_ctrl_regs(struct guest_info * info);
-void v3_print_GPRs(struct guest_info * info);
-
-void v3_print_stack(struct guest_info * info);
 
 #endif /* ! __V3VEE__ */
 
-void v3_print_guest_state_all(struct v3_vm_info * vm);
+
 
 #endif