Changeset 106062 in vbox

Timestamp:

Sep 16, 2024 3:48:55 PM (4 months ago)

Author:

vboxsync

Message:

Unattended: ​bugref:10511. Avoid tripping lock order assert when Unattended::prepare is called.

Location:

trunk/src/VBox/Main

Files:

• include/UnattendedImpl.h (modified) (2 diffs)
• src-server/UnattendedImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/include/UnattendedImpl.h

@@ -166 +166 @@
     RTCList<WIMImage> mDetectedImages;
     bool            mfAvoidUpdatesOverNetwork;
+    com::SafeIfaceArray<IGuestOSType> mSupportedGuestOSTypes;
+    bool           mfDoneSupportedGuestOSList;
     /** @} */
 
@@ -331 +333 @@
     bool i_updateDetectedAttributeForImage(WIMImage const &rImage);
 
+    /**
+     * Gets the list of guest OS type IDs supported by the current host.
+     */
+    HRESULT i_getListOfSupportedGuestOS();
+
 };
 

trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

@@ -258 +258 @@
     : mhThreadReconfigureVM(NIL_RTNATIVETHREAD), mfRtcUseUtc(false), mfGuestOs64Bit(false)
     , mpInstaller(NULL), mpTimeZoneInfo(NULL), mfIsDefaultAuxiliaryBasePath(true), mfDoneDetectIsoOS(false)
-    , mfAvoidUpdatesOverNetwork(false)
+    , mfAvoidUpdatesOverNetwork(false), mfDoneSupportedGuestOSList(false)
 { }
 
@@ -342 +342 @@
     HRESULT       hrc;
 
-    /* Get a list of guest OS Type Ids supported by the host. */
-    ComPtr<ISystemProperties> pSystemProperties;
-    com::SafeIfaceArray<IGuestOSType> supportedGuestOSTypes;
-
-    hrc = mParent->COMGETTER(SystemProperties)(pSystemProperties.asOutParam());
-    if (SUCCEEDED(hrc))
-    {
-        ComPtr<IPlatformProperties> pPlatformProperties;
-        hrc = pSystemProperties->COMGETTER(Platform)(pPlatformProperties.asOutParam());
-        if (SUCCEEDED(hrc))
-        {
-            hrc = pPlatformProperties->COMGETTER(SupportedGuestOSTypes)(ComSafeArrayAsOutParam(supportedGuestOSTypes));
-            if (!SUCCEEDED(hrc))
-                supportedGuestOSTypes.resize(0);
-        }
-    }
+    /* Populate list of supported guest OSs in case it has not been done yet. Do this before locking. */
+    if (!mfDoneSupportedGuestOSList)
+        i_getListOfSupportedGuestOS();
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -510 +497 @@
     /* Check if detected OS type is supported (covers platform architecture). */
     bool fSupported = false;
-    for (size_t i = 0; i < supportedGuestOSTypes.size() && !fSupported; ++i)
-    {
-        ComPtr<IGuestOSType> guestOSType = supportedGuestOSTypes[i];
+    for (size_t i = 0; i < mSupportedGuestOSTypes.size() && !fSupported; ++i)
+    {
+        ComPtr<IGuestOSType> guestOSType = mSupportedGuestOSTypes[i];
 
         Bstr guestId;
@@ -2620 +2607 @@
         return hrc;
 
+    /* Populate list of supported guest OSs in case it has not been done yet. Do this before locking. */
+    if (!mfDoneSupportedGuestOSList)
+        i_getListOfSupportedGuestOS();
+
     /*
      * Write lock this object and set attributes we got from IMachine.
@@ -4497 +4488 @@
     return fRet;
 }
+
+HRESULT Unattended::i_getListOfSupportedGuestOS()
+{
+    HRESULT       hrc;
+    if (mfDoneSupportedGuestOSList)
+        return S_OK;
+    mfDoneSupportedGuestOSList = true;
+
+    /* Get a list of guest OS Type Ids supported by the host. */
+    ComPtr<ISystemProperties> pSystemProperties;
+
+    hrc = mParent->COMGETTER(SystemProperties)(pSystemProperties.asOutParam());
+    if (SUCCEEDED(hrc))
+    {
+        ComPtr<IPlatformProperties> pPlatformProperties;
+        hrc = pSystemProperties->COMGETTER(Platform)(pPlatformProperties.asOutParam());
+        if (SUCCEEDED(hrc))
+        {
+            hrc = pPlatformProperties->COMGETTER(SupportedGuestOSTypes)(ComSafeArrayAsOutParam(mSupportedGuestOSTypes));
+            if (!SUCCEEDED(hrc))
+                mSupportedGuestOSTypes.resize(0);
+        }
+    }
+    return hrc;
+}