Changeset 51220 in vbox for trunk/src/VBox/VMM/include/HMInternal.h

Timestamp:

May 9, 2014 1:51:16 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93632

Message:

VMM/HMVMXR0: Implemented EFER swapping using VMCS controls.

File:

• trunk/src/VBox/VMM/include/HMInternal.h (modified) (4 diffs)

trunk/src/VBox/VMM/include/HMInternal.h

@@ -148 +148 @@
 #define HM_CHANGED_GUEST_SYSENTER_EIP_MSR        RT_BIT(14)
 #define HM_CHANGED_GUEST_SYSENTER_ESP_MSR        RT_BIT(15)
-#define HM_CHANGED_GUEST_LAZY_MSRS               RT_BIT(16)     /* Shared */
+#define HM_CHANGED_GUEST_EFER_MSR                RT_BIT(16)
+#define HM_CHANGED_GUEST_LAZY_MSRS               RT_BIT(17)     /* Shared */
 /* VT-x specific state. */
-#define HM_CHANGED_VMX_GUEST_AUTO_MSRS           RT_BIT(17)
-#define HM_CHANGED_VMX_GUEST_ACTIVITY_STATE      RT_BIT(18)
-#define HM_CHANGED_VMX_GUEST_APIC_STATE          RT_BIT(19)
-#define HM_CHANGED_VMX_ENTRY_CTLS                RT_BIT(20)
-#define HM_CHANGED_VMX_EXIT_CTLS                 RT_BIT(21)
+#define HM_CHANGED_VMX_GUEST_AUTO_MSRS           RT_BIT(18)
+#define HM_CHANGED_VMX_GUEST_ACTIVITY_STATE      RT_BIT(19)
+#define HM_CHANGED_VMX_GUEST_APIC_STATE          RT_BIT(20)
+#define HM_CHANGED_VMX_ENTRY_CTLS                RT_BIT(21)
+#define HM_CHANGED_VMX_EXIT_CTLS                 RT_BIT(22)
 /* AMD-V specific state. */
-#define HM_CHANGED_SVM_GUEST_EFER_MSR            RT_BIT(17)
 #define HM_CHANGED_SVM_GUEST_APIC_STATE          RT_BIT(18)
 #define HM_CHANGED_SVM_RESERVED1                 RT_BIT(19)
 #define HM_CHANGED_SVM_RESERVED2                 RT_BIT(20)
 #define HM_CHANGED_SVM_RESERVED3                 RT_BIT(21)
+#define HM_CHANGED_SVM_RESERVED4                 RT_BIT(22)
 
 #define HM_CHANGED_ALL_GUEST                     (  HM_CHANGED_GUEST_CR0                \
@@ -178 +179 @@
                                                   | HM_CHANGED_GUEST_SYSENTER_EIP_MSR   \
                                                   | HM_CHANGED_GUEST_SYSENTER_ESP_MSR   \
+                                                  | HM_CHANGED_GUEST_EFER_MSR           \
                                                   | HM_CHANGED_GUEST_LAZY_MSRS          \
                                                   | HM_CHANGED_VMX_GUEST_AUTO_MSRS      \
@@ -185 +187 @@
                                                   | HM_CHANGED_VMX_EXIT_CTLS)
 
-#define HM_CHANGED_HOST_CONTEXT                  RT_BIT(22)
+#define HM_CHANGED_HOST_CONTEXT                  RT_BIT(23)
 
 /* Bits shared between host and guest. */
@@ -414 +416 @@
         /** Host EFER value (set by ring-0 VMX init) */
         uint64_t                    u64HostEfer;
+        /** Whether the CPU supports VMCS fields for swapping EFER. */
+        bool                        fSupportsVmcsEfer;
+        bool                        afAlignment1[7];
 
         /** VMX MSR values */