diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2021-08-27 12:45:24 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2021-08-27 12:45:24 +0000 |
| commit | fd0648a90dcab1e613274c2196182a1fb6884a58 (patch) | |
| tree | b3f279e65488ea4d6bd97d895ef9aa00675e1896 | |
| parent | 7006e5f8912cf93611da0383c2202a3dcc94c6ee (diff) | |
| download | VirtualBox-svn-fd0648a90dcab1e613274c2196182a1fb6884a58.tar.gz | |
VMM: Don't need the per-logger flushing-disabled flag (VMMR0_LOGGER_FLAGS_FLUSHING_DISABLED). bugref:10086
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@90953 cfe28804-0f27-0410-a406-dd0f0b0b656f
| -rw-r--r-- | src/VBox/VMM/VMMR0/VMMR0.cpp | 3 | ||||
| -rw-r--r-- | src/VBox/VMM/VMMRZ/VMMRZ.cpp | 10 | ||||
| -rw-r--r-- | src/VBox/VMM/include/VMMInternal.h | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/src/VBox/VMM/VMMR0/VMMR0.cpp b/src/VBox/VMM/VMMR0/VMMR0.cpp index 18ab2f82c38..468147b051d 100644 --- a/src/VBox/VMM/VMMR0/VMMR0.cpp +++ b/src/VBox/VMM/VMMR0/VMMR0.cpp @@ -3110,8 +3110,7 @@ static bool vmmR0LoggerFlushCommon(PRTLOGGER pLogger, PRTLOGBUFFERDESC pBufDesc, /* * Can we wait on the log flusher to do the work? */ - if ( VMMRZCallRing3IsEnabled(pGVCpu) - && !(pLogger->u32UserValue1 & VMMR0_LOGGER_FLAGS_FLUSHING_DISABLED)) + if (VMMRZCallRing3IsEnabled(pGVCpu)) { /* * Make sure we don't recurse forever here should something in the diff --git a/src/VBox/VMM/VMMRZ/VMMRZ.cpp b/src/VBox/VMM/VMMRZ/VMMRZ.cpp index af0c2ffcb56..87c2991591e 100644 --- a/src/VBox/VMM/VMMRZ/VMMRZ.cpp +++ b/src/VBox/VMM/VMMRZ/VMMRZ.cpp @@ -138,16 +138,10 @@ VMMRZDECL(void) VMMRZCallRing3Disable(PVMCPUCC pVCpu) Assert(pVCpu->vmm.s.cCallRing3Disabled < 16); if (ASMAtomicUoIncU32(&pVCpu->vmm.s.cCallRing3Disabled) == 1) { - /** @todo it might make more sense to just disable logging here, then we - * won't flush away important bits... but that goes both ways really. */ #ifdef IN_RC pVCpu->pVMRC->vmm.s.fRCLoggerFlushingDisabled = true; #else pVCpu->vmmr0.s.fLogFlushingDisabled = true; - if (pVCpu->vmmr0.s.u.s.Logger.pLogger) - pVCpu->vmmr0.s.u.s.Logger.pLogger->u32UserValue1 |= VMMR0_LOGGER_FLAGS_FLUSHING_DISABLED; - if (pVCpu->vmmr0.s.u.s.RelLogger.pLogger) - pVCpu->vmmr0.s.u.s.RelLogger.pLogger->u32UserValue1 |= VMMR0_LOGGER_FLAGS_FLUSHING_DISABLED; #endif } @@ -177,10 +171,6 @@ VMMRZDECL(void) VMMRZCallRing3Enable(PVMCPUCC pVCpu) pVCpu->pVMRC->vmm.s.fRCLoggerFlushingDisabled = false; #else pVCpu->vmmr0.s.fLogFlushingDisabled = false; - if (pVCpu->vmmr0.s.u.s.Logger.pLogger) - pVCpu->vmmr0.s.u.s.Logger.pLogger->u32UserValue1 &= ~VMMR0_LOGGER_FLAGS_FLUSHING_DISABLED; - if (pVCpu->vmmr0.s.u.s.RelLogger.pLogger) - pVCpu->vmmr0.s.u.s.RelLogger.pLogger->u32UserValue1 &= ~VMMR0_LOGGER_FLAGS_FLUSHING_DISABLED; #endif } diff --git a/src/VBox/VMM/include/VMMInternal.h b/src/VBox/VMM/include/VMMInternal.h index 75575b563b5..2bb5635f0f0 100644 --- a/src/VBox/VMM/include/VMMInternal.h +++ b/src/VBox/VMM/include/VMMInternal.h @@ -573,8 +573,6 @@ typedef VMMR0PERVCPU *PVMMR0PERVCPU; #define VMMR0_LOGGER_FLAGS_MAGIC_VALUE UINT32_C(0x7d297f05) /** Part of the flags value used for the magic. */ #define VMMR0_LOGGER_FLAGS_MAGIC_MASK UINT32_C(0xffffff0f) -/** Set if flushing is disabled (copy of fLogFlushingDisabled). */ -#define VMMR0_LOGGER_FLAGS_FLUSHING_DISABLED UINT32_C(0x00000010) /** @} */ |