Accepting request 1085561 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/1085561
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=257
This commit is contained in:
Dominique Leuenberger 2023-05-09 11:08:10 +00:00 committed by Git OBS Bridge
commit fbde83f0a3
2 changed files with 9 additions and 2 deletions

View File

@ -2,10 +2,12 @@ Index: VirtualBox-7.0.8/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.8.orig/src/VBox/HostDrivers/Support/SUPDrvGip.cpp --- VirtualBox-7.0.8.orig/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
+++ VirtualBox-7.0.8/src/VBox/HostDrivers/Support/SUPDrvGip.cpp +++ VirtualBox-7.0.8/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
@@ -4537,9 +4537,9 @@ static int supdrvTscDeltaThreadWait(PSUP @@ -4537,9 +4537,11 @@ static int supdrvTscDeltaThreadWait(PSUP
*/ */
static void supdrvTscDeltaThreadStartMeasurement(PSUPDRVDEVEXT pDevExt, bool fForceAll) static void supdrvTscDeltaThreadStartMeasurement(PSUPDRVDEVEXT pDevExt, bool fForceAll)
{ {
+ if (!pDevExt || ! pDevExt->hTscDeltaSpinlock)
+ return;
+ RTSpinlockAcquire(pDevExt->hTscDeltaSpinlock); + RTSpinlockAcquire(pDevExt->hTscDeltaSpinlock);
if (pDevExt->hTscDeltaThread != NIL_RTTHREAD) if (pDevExt->hTscDeltaThread != NIL_RTTHREAD)
{ {
@ -13,7 +15,7 @@ Index: VirtualBox-7.0.8/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
if ( pDevExt->enmTscDeltaThreadState == kTscDeltaThreadState_Listening if ( pDevExt->enmTscDeltaThreadState == kTscDeltaThreadState_Listening
|| pDevExt->enmTscDeltaThreadState == kTscDeltaThreadState_Measuring) || pDevExt->enmTscDeltaThreadState == kTscDeltaThreadState_Measuring)
{ {
@@ -4550,9 +4550,9 @@ static void supdrvTscDeltaThreadStartMea @@ -4550,9 +4552,9 @@ static void supdrvTscDeltaThreadStartMea
else if ( pDevExt->enmTscDeltaThreadState == kTscDeltaThreadState_WaitAndMeasure else if ( pDevExt->enmTscDeltaThreadState == kTscDeltaThreadState_WaitAndMeasure
&& fForceAll) && fForceAll)
pDevExt->fTscThreadRecomputeAllDeltas = true; pDevExt->fTscThreadRecomputeAllDeltas = true;

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 8 18:26:38 UTC 2023 - Larry Finger <Larry.Finger@gmail.com>
- Update fix_7.0.6_locking_problems.patch for Vagrent/virtualbox startup problems boo#1209727
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 4 16:46:55 UTC 2023 - Dirk Müller <dmueller@suse.com> Thu May 4 16:46:55 UTC 2023 - Dirk Müller <dmueller@suse.com>