Changeset 46363 in vbox for trunk/src/VBox/VMM/VMMR0
- Timestamp:
- Jun 3, 2013 3:01:02 PM (12 years ago)
- Location:
- trunk/src/VBox/VMM/VMMR0
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMR0/HMR0.cpp
r46358 r46363 1041 1041 VMMR0_INT_DECL(int) HMR0EnableAllCpus(PVM pVM) 1042 1042 { 1043 /* Make sure we don't touch hm after we've disabled hmin1043 /* Make sure we don't touch HM after we've disabled HM in 1044 1044 preparation of a suspend. */ 1045 1045 if (ASMAtomicReadBool(&g_HvmR0.fSuspended)) … … 1226 1226 #endif 1227 1227 1228 /* Make sure we don't touch hm after we've disabled hmin preparation of a suspend. */1228 /* Make sure we don't touch HM after we've disabled HM in preparation of a suspend. */ 1229 1229 if (ASMAtomicReadBool(&g_HvmR0.fSuspended)) 1230 1230 return VERR_HM_SUSPEND_PENDING; … … 1320 1320 AssertReturn(pVM, VERR_INVALID_PARAMETER); 1321 1321 1322 /* Make sure we don't touch hm after we've disabled hmin preparation1322 /* Make sure we don't touch HM after we've disabled HM in preparation 1323 1323 of a suspend. */ 1324 1324 /** @todo r=bird: This cannot be right, the termination functions are … … 1358 1358 AssertReturn(pVM, VERR_INVALID_PARAMETER); 1359 1359 1360 /* Make sure we don't touch hm after we've disabled hmin1360 /* Make sure we don't touch HM after we've disabled HM in 1361 1361 preparation of a suspend. */ 1362 1362 AssertReturn(!ASMAtomicReadBool(&g_HvmR0.fSuspended), VERR_HM_SUSPEND_PENDING); 1363 1364 1363 1365 1364 /* … … 1430 1429 CPUMDeactivateGuestDebugState(pVCpu); 1431 1430 1432 /* Always reload the host context and the guest's CR0 register for the FPU bits (#NM, #MF, CR0.NE, CR0.TS, CR0.MP). */ 1431 /* Always reload the host context and the guest's CR0 register for the FPU 1432 bits (#NM, #MF, CR0.NE, CR0.TS, CR0.MP). */ 1433 1433 pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR0 | HM_CHANGED_HOST_CONTEXT; 1434 1434 -
trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp
r46315 r46363 1506 1506 { 1507 1507 /* 1508 * Determine optimal flush type for nested paging.1508 * Determine optimal flush type for Nested Paging. 1509 1509 * We cannot ignore EPT if no suitable flush-types is supported by the CPU as we've already setup unrestricted 1510 1510 * guest execution (see hmR3InitFinalizeR0()). … … 1661 1661 } 1662 1662 1663 /* Without nested paging, INVLPG (also affects INVPCID) and MOV CR3 instructions should cause VM-exits. */1663 /* Without Nested Paging, INVLPG (also affects INVPCID) and MOV CR3 instructions should cause VM-exits. */ 1664 1664 if (!pVM->hm.s.fNestedPaging) 1665 1665 { … … 1882 1882 uint32_t u32XcptBitmap = 0; 1883 1883 1884 /* Without nested paging, #PF must cause a VM-exit so we can sync our shadow page tables. */1884 /* Without Nested Paging, #PF must cause a VM-exit so we can sync our shadow page tables. */ 1885 1885 if (!pVM->hm.s.fNestedPaging) 1886 1886 u32XcptBitmap |= RT_BIT(X86_XCPT_PF);
Note:
See TracChangeset
for help on using the changeset viewer.