debugging tweaks and minor fixes

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

diff --git a/palacios/include/palacios/vmx.h b/palacios/include/palacios/vmx.h
index 67e546b..a37ead8 100644 (file)
--- a/palacios/include/palacios/vmx.h
+++ b/palacios/include/palacios/vmx.h
@@ -1,4 +1,5 @@
 
+
 /* 
  * This file is part of the Palacios Virtual Machine Monitor developed
  * by the V3VEE Project with funding from the United States National 
@@ -213,6 +214,10 @@ struct vmcs_host_state {
     struct v3_segment  tr;
 };
 
+
+
+
+
 struct vmx_data {
     vmx_state_t state;
     struct vmcs_host_state host_state;
@@ -221,6 +226,9 @@ struct vmx_data {
 
     uint8_t ia32e_avail;
 
+    v3_reg_t guest_cr4; /// corresponds to the CR4 Read shadow
+
+
     /* VMX Control Fields */
     struct vmx_pin_ctrls pin_ctrls;
     struct vmx_pri_proc_ctrls pri_proc_ctrls;
@@ -230,9 +238,12 @@ struct vmx_data {
 };
 
 int v3_is_vmx_capable();
-void v3_init_vmx_hooks(struct v3_ctrl_ops * vm_ops);
 void v3_init_vmx_cpu(int cpu_id);
 
+int v3_start_vmx_guest(struct guest_info* info);
+int v3_vmx_enter(struct guest_info * info);
+
+int v3_init_vmx_vmcs(struct guest_info * info, v3_vm_class_t vm_class);
 
 #endif // ! __V3VEE__