Succesful transition to vmxassist, then to the bios, where it dies in keyboard init.

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

diff --git a/palacios/include/palacios/vmx.h b/palacios/include/palacios/vmx.h
index 5da6609..e5fe949 100644 (file)
--- a/palacios/include/palacios/vmx.h
+++ b/palacios/include/palacios/vmx.h
@@ -33,7 +33,7 @@
 
 // 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
@@ -77,26 +77,31 @@ typedef enum {
 } vmx_state_t;
 
 struct tss_descriptor {
-    uint16_t    limit1;
-    uint16_t    base1;
-    uint_t  base2       : 8;
-    /* In 32 bit 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;
+    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;
+        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 {
@@ -109,6 +114,12 @@ 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;
 };
 
 
@@ -128,6 +139,9 @@ struct Instruction {
 
 int v3_is_vmx_capable();
 void v3_init_vmx(struct v3_ctrl_ops* vm_ops);
+int v3_update_vmcs_guest_state(struct guest_info * info);
+int v3_update_vmcs_ctrl_fields(struct guest_info * info);
+int v3_update_vmcs_host_state(struct guest_info * info);