* redistribute, and modify it as specified in the file "V3VEE_LICENSE".
*/
-#ifndef __VM_GUEST_H
-#define __VM_GUEST_H
+#ifndef __VM_GUEST_H__
+#define __VM_GUEST_H__
#ifdef __V3VEE__
-
-#include <palacios/vmm_mem.h>
#include <palacios/vmm_types.h>
+#include <palacios/vmm_mem.h>
#include <palacios/vmm_io.h>
#include <palacios/vmm_shadow_paging.h>
#include <palacios/vmm_intr.h>
#include <palacios/vmm_time.h>
#include <palacios/vmm_emulator.h>
#include <palacios/vmm_host_events.h>
-
-typedef ullong_t v3_reg_t;
+#include <palacios/vmm_msr.h>
struct emulation_state;
struct v3_intr_state;
-struct vm_ctrl_ops {
- int (*raise_irq)(struct guest_info * info, int irq);
- int (*lower_irq)(struct guest_info * info, int irq);
-};
-
-
-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 {
struct v3_intr_state intr_state;
struct vmm_io_map io_map;
+
+ struct v3_msr_map msr_map;
// device_map
struct vmm_dev_mgr dev_mgr;
struct v3_dbg_regs dbg_regs;
struct v3_segments segments;
- struct vm_ctrl_ops vm_ops;
-
struct emulation_state emulator;
v3_vm_operating_mode_t run_state;
void * vmm_data;
+
+ struct v3_msr guest_efer;
+
/* TEMP */
//ullong_t exit_tsc;