Changeset 72750 in vbox

Timestamp:

Jun 29, 2018 8:09:01 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Extend HM changed flags. ​​bugref:9193 [build fix, nit]

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMR0.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (1 diff)

trunk/include/VBox/vmm/hm_vmx.h

@@ -426 +426 @@
 #define VMX_VMCS_GUEST_SYSENTER_ESP_CACHE_IDX                   12
 #define VMX_VMCS_GUEST_SYSENTER_EIP_CACHE_IDX                   13
-#define VMX_VMCS_RO_EXIT_QUAL_CACHE_IDX                         14
-#define VMX_VMCS_MAX_CACHE_IDX                                  (VMX_VMCS_RO_EXIT_QUAL_CACHE_IDX + 1)
+#define VMX_VMCS_RO_EXIT_QUALIFICATION_CACHE_IDX                14
+#define VMX_VMCS_MAX_CACHE_IDX                                  (VMX_VMCS_RO_EXIT_QUALIFICATION_CACHE_IDX + 1)
 #define VMX_VMCS_GUEST_CR3_CACHE_IDX                            15
 #define VMX_VMCS_MAX_NESTED_PAGING_CACHE_IDX                    (VMX_VMCS_GUEST_CR3_CACHE_IDX + 1)

trunk/src/VBox/VMM/VMMR0/HMR0.cpp

@@ -1393 +1393 @@
 
     int              rc    = VINF_SUCCESS;
-    RTCPUID          idCpu = RTMpCpuId();
-    PHMGLOBALCPUINFO pCpu = &g_HmR0.aCpuInfo[idCpu];
+    RTCPUID const    idCpu = RTMpCpuId();
+    PHMGLOBALCPUINFO pCpu  = &g_HmR0.aCpuInfo[idCpu];
     AssertPtr(pCpu);
 
@@ -1437 +1437 @@
 #endif
 
-    RTCPUID          idCpu = RTMpCpuId();
+    RTCPUID const    idCpu = RTMpCpuId();
     PHMGLOBALCPUINFO pCpu  = &g_HmR0.aCpuInfo[idCpu];
     Assert(pCpu);
@@ -1485 +1485 @@
     VMCPU_ASSERT_EMT_RETURN(pVCpu, VERR_HM_WRONG_CPU);
 
-    RTCPUID          idCpu = RTMpCpuId();
+    RTCPUID const    idCpu = RTMpCpuId();
     PHMGLOBALCPUINFO pCpu  = &g_HmR0.aCpuInfo[idCpu];
 
@@ -1681 +1681 @@
 {
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
-    RTCPUID idCpu = RTMpCpuId();
+    RTCPUID const idCpu = RTMpCpuId();
     Assert(idCpu < RT_ELEMENTS(g_HmR0.aCpuInfo));
     return &g_HmR0.aCpuInfo[idCpu];

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -4673 +4673 @@
             AssertRCReturn(rc, rc);
 # ifdef LOG_ENABLED
-            PCVMXAUTOMSR pMsr = (PVMXAUTOMSR)CpVCpu->hm.s.vmx.pvGuestMsr;
+            PCVMXAUTOMSR pMsr = (PVMXAUTOMSR)pVCpu->hm.s.vmx.pvGuestMsr;
             for (uint32_t i = 0; i < pVCpu->hm.s.vmx.cMsrs; i++, pMsr++)
                 Log4Func(("MSR[%RU32]: u32Msr=%#RX32 u64Value=%#RX64\n", i, pMsr->u32Msr, pMsr->u64Value));