major VMX update

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

diff --git a/palacios/include/palacios/vmcb.h b/palacios/include/palacios/vmcb.h
index 04dec0a..5effea4 100644 (file)
--- a/palacios/include/palacios/vmcb.h
+++ b/palacios/include/palacios/vmcb.h
@@ -179,8 +179,7 @@ struct Guest_Control {
     uint_t rsvd4      : 24;  // Should be 0
 } __attribute__((packed));
 
-#define SVM_INJECTION_EXTERNAL_INTR 0
-#define SVM_INJECTION_VIRTUAL_INTR  0
+#define SVM_INJECTION_IRQ  0
 #define SVM_INJECTION_NMI           2
 #define SVM_INJECTION_EXCEPTION     3
 #define SVM_INJECTION_SOFT_INTR     4
@@ -275,7 +274,7 @@ typedef struct VMCB_Control_Area vmcb_ctrl_t;
 
 
 struct vmcb_selector {
-    ushort_t selector;
+    uint16_t selector;
 
     /* These attributes are basically a direct map of the attribute fields of a segment desc.
      * The segment limit in the middle is removed and the fields are fused together
@@ -296,8 +295,8 @@ struct vmcb_selector {
        }  __attribute__((packed)) fields;
     }  __attribute__((packed)) attrib;
 
-    uint_t  limit;
-    ullong_t base;
+    uint32_t  limit;
+    uint64_t base;
 }  __attribute__((packed));