X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmx.h;h=2b50a04890cc60d9553660c4689b119bde0a33c0;hb=3dd047dc0f70231ea93e5b3b40a9142a391bf507;hp=278622fdf06a12e415c765a436bb01d4ee61c84b;hpb=5db3136d5331c355c188537c68005db8d2cb4eac;p=palacios-OLD.git

diff --git a/palacios/include/palacios/vmx.h b/palacios/include/palacios/vmx.h
index 278622f..2b50a04 100644
--- a/palacios/include/palacios/vmx.h
+++ b/palacios/include/palacios/vmx.h
@@ -28,77 +28,56 @@
 
 #include <palacios/vmm_types.h>
 #include <palacios/vmcs.h>
-
-#define IA32_FEATURE_CONTROL_MSR ((unsigned int)0x3a)
-#define IA32_VMX_BASIC_MSR ((unsigned int)0x480)
-#define IA32_VMX_PINBASED_CTLS_MSR ((unsigned int)0x481)
-#define IA32_VMX_PROCBASED_CTLS_MSR ((unsigned int)0x482)
-#define IA32_VMX_EXIT_CTLS_MSR ((unsigned int)0x483)
-#define IA32_VMX_ENTRY_CTLS_MSR ((unsigned int)0x484)
-#define IA32_VMX_MISC_MSR ((unsigned int)0x485)
-#define IA32_VMX_CR0_FIXED0_MSR ((unsigned int)0x486)
-#define IA32_VMX_CR0_FIXED1_MSR ((unsigned int)0x487)
-#define IA32_VMX_CR4_FIXED0_MSR ((unsigned int)0x488)
-#define IA32_VMX_CR4_FIXED1_MSR ((unsigned int)0x489)
-#define IA32_VMX_VMCS_ENUM_MSR ((unsigned ing)0x48A)
-
-#define VMX_SUCCESS         0
+#include <palacios/vmm.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 (1)
-#define FEATURE_CONTROL_VMXON (1<<2)
-#define FEATURE_CONTROL_VALID ( FEATURE_CONTROL_LOCK | FEATURE_CONTROL_VMXON)
-
-
-#define CPUID_1_ECX_VTXFLAG (1<<5)
-
-
+#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
 
-typedef void VmxOnRegion;
 
 
-
-struct MSR_REGS {
-  uint_t low;
-  uint_t high;
-} __attribute__((packed));
-
-struct VMX_BASIC {
-  uint_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));
-
-union VMX_MSR {
-  struct MSR_REGS regs;
-  struct VMX_BASIC vmxBasic;
+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_STARTUP,
+    VMXASSIST_V8086_BIOS,
+    VMXASSIST_V8086,
+    NORMAL 
+} vmx_state_t;
 
-struct VMDescriptor {
-  uint_t   entry_ip;
-  uint_t   exit_eip;
-  uint_t   guest_esp;
-}  __attribute__((packed));
-
-
-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;
 };
 
 
@@ -114,20 +93,14 @@ struct Instruction {
 };
 
 
-void DecodeCurrentInstruction(struct VM *vm, struct Instruction *out);
 
 
-int is_vmx_capable();
+int v3_is_vmx_capable();
+void v3_init_vmx(struct v3_ctrl_ops* vm_ops);
 
-VmxOnRegion * Init_VMX();
-VmxOnRegion * CreateVmxOnRegion();
-
-int VMLaunch(struct VMDescriptor *vm);
-
-
-int Do_VMM(struct VMXRegs regs);
 
 
 #endif // ! __V3VEE__
 
 #endif 
+