vbox: add tm 4s patch

Issue #2110
This commit is contained in:
Alexander Boettcher 2016-09-23 17:59:20 +02:00 committed by Christian Helmuth
parent 08185e962f
commit ce2139a533
4 changed files with 45 additions and 2 deletions

View File

@ -1 +1 @@
38087cad05854ea953885c3c7187dc25d323140e
02d35b49aef0818e5c3f17720d7cf659661b45ed

View File

@ -1 +1 @@
f22cfd50576d6821473e202a8a3fc973a9f808d4
35ce173a7916f4a2f3b8bd6bf616506f63e43ac0

View File

@ -15,3 +15,4 @@ time-log-deadlock.patch
tm_retries.patch
vmdk.patch
tm_tpr.patch
tm_4s.patch

View File

@ -0,0 +1,42 @@
--- a/src/app/virtualbox/src/VBox/VMM/VMMAll/TMAllVirtual.cpp
+++ b/src/app/virtualbox/src/VBox/VMM/VMMAll/TMAllVirtual.cpp
@@ -437,7 +437,7 @@
bool fStop = false;
const uint64_t u64Prev = pVM->tm.s.u64VirtualSyncCatchUpPrev;
uint64_t u64Delta = u64 - u64Prev;
- if (RT_LIKELY(!(u64Delta >> 32)))
+ if (RT_LIKELY(!(u64Delta >> 63)))
{
uint64_t u64Sub = ASMMultU64ByU32DivByU32(u64Delta, pVM->tm.s.u32VirtualSyncCatchUpPercentage, 100);
if (off > u64Sub + pVM->tm.s.offVirtualSyncGivenUp)
@@ -770,7 +770,7 @@
|| cOuterTries <= 0)
{
uint64_t u64Delta = u64 - u64Prev;
- if (RT_LIKELY(!(u64Delta >> 32)))
+ if (RT_LIKELY(!(u64Delta >> 63)))
{
uint64_t u64Sub = ASMMultU64ByU32DivByU32(u64Delta, u32Pct, 100);
if (off > u64Sub + offGivenUp)
--- a/src/app/virtualbox/src/VBox/VMM/VMMAll/TMAll.cpp
+++ b/src/app/virtualbox/src/VBox/VMM/VMMAll/TMAll.cpp
@@ -857,7 +857,7 @@
|| cOuterTries <= 0)
{
uint64_t u64Delta = u64Now - u64Prev;
- if (RT_LIKELY(!(u64Delta >> 32)))
+ if (RT_LIKELY(!(u64Delta >> 63)))
{
uint64_t u64Sub = ASMMultU64ByU32DivByU32(u64Delta, u32Pct, 100);
if (off > u64Sub + offGivenUp)
--- a/src/app/virtualbox/src/VBox/VMM/VMMR3/TM.cpp
+++ b/src/app/virtualbox/src/VBox/VMM/VMMR3/TM.cpp
@@ -2149,7 +2160,7 @@
if (pVM->tm.s.fVirtualSyncCatchUp)
{
uint64_t u64Delta = u64VirtualNow - pVM->tm.s.u64VirtualSyncCatchUpPrev;
- if (RT_LIKELY(!(u64Delta >> 32)))
+ if (RT_LIKELY(!(u64Delta >> 63)))
{
uint64_t u64Sub = ASMMultU64ByU32DivByU32(u64Delta, pVM->tm.s.u32VirtualSyncCatchUpPercentage, 100);
if (off > u64Sub + offSyncGivenUp)