Changeset 42894 in vbox for trunk/src/VBox/VMM/VMMR0
- Timestamp:
- Aug 21, 2012 8:00:10 AM (13 years ago)
- svn:sync-xref-src-repo-rev:
- 80184
- Location:
- trunk/src/VBox/VMM/VMMR0
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp
r42840 r42894 891 891 /* Sync the hypervisor debug state now if any breakpoint is armed. */ 892 892 if ( CPUMGetHyperDR7(pVCpu) & (X86_DR7_ENABLED_MASK|X86_DR7_GD) 893 && 894 && 893 && !CPUMIsHyperDebugStateActive(pVCpu) 894 && !DBGFIsStepping(pVCpu)) 895 895 { 896 896 /* Save the host and load the hypervisor debug state. */ … … 907 907 #endif 908 908 /* Sync the debug state now if any breakpoint is armed. */ 909 if ( 910 && 911 && 909 if ( (pCtx->dr[7] & (X86_DR7_ENABLED_MASK|X86_DR7_GD)) 910 && !CPUMIsGuestDebugStateActive(pVCpu) 911 && !DBGFIsStepping(pVCpu)) 912 912 { 913 913 STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatDRxArmed); … … 2822 2822 break; 2823 2823 2824 switch (pPatch->enmType)2824 switch (pPatch->enmType) 2825 2825 { 2826 2826 case HWACCMTPRINSTR_READ: … … 2856 2856 break; 2857 2857 2858 default:2859 AssertMsgFailedReturn(("Unexpected type %d\n", pPatch->enmType), VERR_HMSVM_UNEXPECTED_PATCH_TYPE);2858 default: 2859 AssertMsgFailedReturn(("Unexpected type %d\n", pPatch->enmType), VERR_HMSVM_UNEXPECTED_PATCH_TYPE); 2860 2860 } 2861 2861 } -
trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp
r42857 r42894 1924 1924 if (!pVM->hwaccm.s.fNestedPaging) 1925 1925 { 1926 switch (pVCpu->hwaccm.s.enmShadowMode)1926 switch (pVCpu->hwaccm.s.enmShadowMode) 1927 1927 { 1928 1928 case PGMMODE_REAL: /* Real mode -> emulated using v86 mode */ … … 4602 4602 unsigned uAccessType = VMX_EXIT_QUALIFICATION_APIC_ACCESS_TYPE(exitQualification); 4603 4603 4604 switch (uAccessType)4604 switch (uAccessType) 4605 4605 { 4606 4606 case VMX_APIC_ACCESS_TYPE_LINEAR_READ:
Note:
See TracChangeset
for help on using the changeset viewer.