Changeset 70733 in vbox for trunk/src/VBox/VMM/VMMAll
- Timestamp:
- Jan 25, 2018 4:51:06 AM (7 years ago)
- Location:
- trunk/src/VBox/VMM/VMMAll
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMAll/IEMAll.cpp
r70643 r70733 13916 13916 /** @todo Maybe someday we can centralize this under CPUMCanInjectInterrupt()? */ 13917 13917 #if defined(VBOX_WITH_NESTED_HWVIRT) 13918 bool fIntrEnabled = pOrgCtx->hwvirt. svm.fGif;13918 bool fIntrEnabled = pOrgCtx->hwvirt.Gif; 13919 13919 if (fIntrEnabled) 13920 13920 { … … 15277 15277 /** @todo Maybe someday we can centralize this under CPUMCanInjectInterrupt()? */ 15278 15278 #if defined(VBOX_WITH_NESTED_HWVIRT) 15279 bool fIntrEnabled = pCtx->hwvirt. svm.fGif;15279 bool fIntrEnabled = pCtx->hwvirt.Gif; 15280 15280 if (fIntrEnabled) 15281 15281 { … … 15343 15343 /** @todo Can we centralize this under CPUMCanInjectInterrupt()? */ 15344 15344 #if defined(VBOX_WITH_NESTED_HWVIRT) 15345 bool fIntrEnabled = pCtx->hwvirt. svm.fGif;15345 bool fIntrEnabled = pCtx->hwvirt.fGif; 15346 15346 if (fIntrEnabled) 15347 15347 { -
trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h
r70464 r70733 112 112 * Disable the global interrupt flag to prevent interrupts during the 'atomic' world switch. 113 113 */ 114 pCtx->hwvirt. svm.fGif = false;114 pCtx->hwvirt.fGif = false; 115 115 116 116 Assert(CPUMSELREG_ARE_HIDDEN_PARTS_VALID(pVCpu, &pCtx->es)); … … 632 632 * Clear global interrupt flags to allow interrupts in the guest. 633 633 */ 634 pCtx->hwvirt. svm.fGif = true;634 pCtx->hwvirt.fGif = true; 635 635 636 636 /* … … 678 678 * NRIP for the nested-guest to calculate the instruction length 679 679 * below. */ 680 LogFlow(("iemSvmVmrun: Injecting event: %04x:%08RX64 uVector=%#x enmType=%d uErrorCode=%u cr2=%#RX64 efer=%#RX64\n",681 pCtx->cs.Sel, pCtx->rip, uVector, enmType, uErrorCode, pCtx->cr2, pCtx-> msrEFER));680 LogFlow(("iemSvmVmrun: Injecting event: %04x:%08RX64 vec=%#x type=%d uErr=%u cr2=%#RX64 cr3=%#RX64 efer=%#RX64\n", 681 pCtx->cs.Sel, pCtx->rip, uVector, enmType, uErrorCode, pCtx->cr2, pCtx->cr3, pCtx->msrEFER)); 682 682 rcStrict = IEMInjectTrap(pVCpu, uVector, enmType, uErrorCode, pCtx->cr2, 0 /* cbInstr */); 683 683 } … … 1274 1274 } 1275 1275 1276 pCtx->hwvirt. svm.fGif = false;1276 pCtx->hwvirt.fGif = false; 1277 1277 iemRegAddToRipAndClearRF(pVCpu, cbInstr); 1278 1278 … … 1304 1304 } 1305 1305 1306 pCtx->hwvirt. svm.fGif = true;1306 pCtx->hwvirt.fGif = true; 1307 1307 iemRegAddToRipAndClearRF(pVCpu, cbInstr); 1308 1308
Note:
See TracChangeset
for help on using the changeset viewer.