#include <palacios/vmm_intr.h>
#include <palacios/vmm_dev_mgr.h>
#include <palacios/vmm_time.h>
-#include <palacios/vmm_emulator.h>
#include <palacios/vmm_host_events.h>
#include <palacios/vmm_msr.h>
#include <palacios/vmm_profiler.h>
+#include <palacios/vmm_hypercall.h>
struct v3_segment gdtr;
struct v3_segment idtr;
struct v3_segment tr;
-} ;
+};
struct shadow_page_state;
-struct emulation_state;
struct v3_intr_state;
struct v3_profiler;
uint_t cpl;
- addr_t mem_size; // Probably in bytes for now....
+ addr_t mem_size; // In bytes for now
v3_shdw_map_t mem_map;
v3_io_map_t io_map;
struct v3_msr_map msr_map;
- // device_map
+
+ v3_hypercall_map_t hcall_map;
+
+ // device_map
struct vmm_dev_mgr dev_mgr;
struct v3_host_events host_event_hooks;
v3_vm_cpu_mode_t cpu_mode;
v3_vm_mem_mode_t mem_mode;
+ uint_t addr_width;
struct v3_gprs vm_regs;
void * decoder_state;
- struct v3_msr guest_efer;
+ v3_msr_t guest_efer;
+ /* Do we need these ? */
+ v3_msr_t guest_star;
+ v3_msr_t guest_lstar;
+ v3_msr_t guest_cstar;
+ v3_msr_t guest_syscall_mask;
+ v3_msr_t guest_gs_base;
+
+
+ uint64_t fs;
+ uint64_t gs;
- struct v3_msr shadow_cstar;
- struct v3_msr shadow_star;
- struct v3_msr shadow_lstar;
- struct v3_msr shadow_syscall_mask;
-
- /* TEMP */
- //ullong_t exit_tsc;
};
+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);