X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmx.h;h=7a0a0395064195f9e93fb64e2104a9d1a71b75c3;hb=0fedb532c5ca028b24b49fb370763006cbc9de51;hp=f009a247ff40633f8a3bda7ed14f450c6c9effdb;hpb=cfcceed5890430afedcc544bd7dbb69e29dfd65a;p=palacios-OLD.git

diff --git a/palacios/include/palacios/vmx.h b/palacios/include/palacios/vmx.h
index f009a24..7a0a039 100644
--- a/palacios/include/palacios/vmx.h
+++ b/palacios/include/palacios/vmx.h
@@ -1,4 +1,3 @@
-
 /* 
  * This file is part of the Palacios Virtual Machine Monitor developed
  * by the V3VEE Project with funding from the United States National 
@@ -31,31 +30,14 @@
 #include <palacios/vmm.h>
 #include <palacios/vm_guest.h>
 
-// Intel VMX Specific MSRs
-#define VMX_FEATURE_CONTROL_MSR     0x0000003a
-#define VMX_BASIC_MSR               0x00000480
-#define VMX_PINBASED_CTLS_MSR       0x00000481
-#define VMX_PROCBASED_CTLS_MSR      0x00000482
-#define VMX_EXIT_CTLS_MSR           0x00000483
-#define VMX_ENTRY_CTLS_MSR          0x00000484
-#define VMX_MISC_MSR                0x00000485
-#define VMX_CR0_FIXED0_MSR          0x00000486
-#define VMX_CR0_FIXED1_MSR          0x00000487
-#define VMX_CR4_FIXED0_MSR          0x00000488
-#define VMX_CR4_FIXED1_MSR          0x00000489
-#define VMX_VMCS_ENUM_MSR           0x0000048A
 
 #define VMX_SUCCESS        0
 #define VMX_FAIL_INVALID   1
 #define VMX_FAIL_VALID     2
 #define VMM_ERROR          3
 
-#define FEATURE_CONTROL_LOCK  0x00000001
-#define FEATURE_CONTROL_VMXON 0x00000004
-#define FEATURE_CONTROL_VALID ( FEATURE_CONTROL_LOCK | FEATURE_CONTROL_VMXON )
 
 
-#define CPUID_1_ECX_VTXFLAG 0x00000020
 
 
 struct vmx_pin_ctrls {
@@ -169,19 +151,15 @@ struct vmx_entry_ctrls {
     } __attribute__((packed));
 } __attribute__((packed));
 
-struct vmx_basic_msr {
-    uint32_t revision;
-    uint_t regionSize   : 13;
-    uint_t rsvd1        : 4; // Always 0
-    uint_t physWidth    : 1;
-    uint_t smm          : 1; // Always 1
-    uint_t memType      : 4;
-    uint_t rsvd2        : 10; // Always 0
-}  __attribute__((packed));
 
 typedef enum { 
     VMXASSIST_DISABLED,
     VMXASSIST_ENABLED
+} vmxassist_state_t;
+
+typedef enum {
+    VMX_UNLAUNCHED,
+    VMX_LAUNCHED
 } vmx_state_t;
 
 struct tss_descriptor {
@@ -213,14 +191,22 @@ struct vmcs_host_state {
     struct v3_segment  tr;
 };
 
+
+
+
+
 struct vmx_data {
     vmx_state_t state;
+    vmxassist_state_t assist_state;
     struct vmcs_host_state host_state;
 
     addr_t vmcs_ptr_phys;
 
     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 +216,15 @@ struct vmx_data {
 };
 
 int v3_is_vmx_capable();
-void v3_init_vmx(struct v3_ctrl_ops * vm_ops);
 
+void v3_init_vmx_cpu(int cpu_id);
+void v3_deinit_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);
+int v3_deinit_vmx_vmcs(struct guest_info * core);
 
 #endif // ! __V3VEE__