X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmx.h;h=4ac707b4e0290fe99bab16e37123046399feb7e0;hb=52a58bb7bdf06ca22ad6883f8095f8aa5ca4b8a4;hp=d637d8f149b18e414f6b8cf388abd65d7d893de8;hpb=1316eb77b6d89245583446dab3345f749c415764;p=palacios.git

diff --git a/palacios/include/palacios/vmx.h b/palacios/include/palacios/vmx.h
index d637d8f..4ac707b 100644
--- a/palacios/include/palacios/vmx.h
+++ b/palacios/include/palacios/vmx.h
@@ -28,10 +28,12 @@
 
 #include <palacios/vmm_types.h>
 #include <palacios/vmcs.h>
+#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_BASIC_MSR          0x00000480
 #define VMX_PINBASED_CTLS_MSR       0x00000481
 #define VMX_PROCBASED_CTLS_MSR      0x00000482
 #define VMX_EXIT_CTLS_MSR           0x00000483
@@ -67,25 +69,58 @@ struct vmx_basic_msr {
     uint_t rsvd2        : 10; // Always 0
 }  __attribute__((packed));
 
+typedef enum { 
+    VMXASSIST_STARTUP,
+    VMXASSIST_V8086_BIOS,
+    VMXASSIST_V8086,
+    NORMAL 
+} vmx_state_t;
+
+struct tss_descriptor {
+    union {
+    ulong_t value;
+    struct {
+        uint16_t    limit1;
+        uint16_t    base1;
+        uint_t      base2       : 8;
+        /* In IA32, type follows the form 10B1b, where B is the busy flag */
+        uint_t      type        : 4; 
+        uint_t      zero1       : 1;
+        uint_t      dpl         : 2;
+        uint_t      present     : 1;
+        uint_t      limit2      : 4;
+        uint_t      available   : 1;
+        uint_t      zero2       : 1;
+        uint_t      zero3       : 1;
+        uint_t      granularity : 1;
+        uint_t      base3       : 8;
+#ifdef __V3_64BIT__
+        uint32_t    base4;
+        uint_t      rsvd1       : 8;
+        uint_t      zero4       : 5;
+        uint_t      rsvd2       : 19;
+#endif
+    } __attribute__((packed));
+    } __attribute__((packed));
+}__attribute__((packed));
+
+struct vmcs_host_state {
+    struct v3_segment  gdtr;
+    struct v3_segment  idtr;
+    struct v3_segment  tr;
+};
 
-
-
-
-enum VMState { VM_VMXASSIST_STARTUP, VM_VMXASSIST_V8086_BIOS, VM_VMXASSIST_V8086, VM_NORMAL };
-
-
-
-
-
-
-
-struct VM {
-  enum VMState        state;
-  struct VMXRegs      registers;
-  struct VMDescriptor descriptor;
-  struct VMCSData     vmcs;
-  struct VMCS         *vmcsregion;
-  struct VmxOnRegion  *vmxonregion;
+struct vmx_data {
+    vmx_state_t state;
+    addr_t vmcs_ptr_phys;
+    struct vmcs_host_state host_state;
+    /* VMX Control Fields */
+    uint32_t pinbased_ctrls;
+    uint32_t pri_procbased_ctrls;
+    uint32_t sec_procbased_ctrls;
+    uint32_t exit_ctrls;
+    uint32_t entry_ctrls;
+    uint32_t excp_bitmap;
 };
 
 
@@ -103,17 +138,13 @@ struct Instruction {
 
 
 
-int is_vmx_capable();
-
-VmxOnRegion * Init_VMX();
-VmxOnRegion * CreateVmxOnRegion();
+int v3_is_vmx_capable();
+void v3_init_vmx(struct v3_ctrl_ops* vm_ops);
 
-int VMLaunch(struct VMDescriptor *vm);
-
-
-int Do_VMM(struct VMXRegs regs);
 
 
 #endif // ! __V3VEE__
 
 #endif 
+
+