Changeset 101179 in vbox for trunk/src

Timestamp:

Sep 19, 2023 5:04:05 PM (15 months ago)

Author:

vboxsync

Message:

Main: IVirtualBox::getGuestOSType() now will only return the supported guest OS types for the host platform currently running on. This in turn is controlled by ISystemProperties::getSupportedPlatformArchitectures(). bugref:10384

File:

• trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -1377 +1377 @@
 {
     AutoReadLock al(m->allGuestOSTypes.getLockHandle() COMMA_LOCKVAL_SRC_POS);
-    aGuestOSTypes.resize(m->allGuestOSTypes.size());
-    size_t i = 0;
-    for (GuestOSTypesOList::const_iterator it = m->allGuestOSTypes.begin();
-         it != m->allGuestOSTypes.end(); ++it, ++i)
-         (*it).queryInterfaceTo(aGuestOSTypes[i].asOutParam());
+
+    com::SafeArray<PlatformArchitecture_T> supportedPlatformArchitectures;
+    HRESULT hrc = m->pSystemProperties->COMGETTER(SupportedPlatformArchitectures)(ComSafeArrayAsOutParam(supportedPlatformArchitectures));
+    ComAssertComRCRetRC(hrc);
+
+    aGuestOSTypes.clear();
+
+    /** @todo We might want to redo this at some point, to better group / hash this. */
+
+    for (GuestOSTypesOList::const_iterator it = m->allGuestOSTypes.begin(); it != m->allGuestOSTypes.end(); ++it)
+    {
+        bool fFound = false;
+        if (supportedPlatformArchitectures.size() == 0) /* If empty, we add all types we have. */
+            fFound = true;
+        else
+        {
+            for (size_t i = 0; i < supportedPlatformArchitectures.size(); i++)
+            {
+                if (supportedPlatformArchitectures[i] == (*it)->i_platformArchitecture())
+                {
+                    fFound = true;
+                    break;
+                }
+            }
+        }
+
+        if (fFound)
+        {
+            ComPtr<IGuestOSType> osType;
+            (*it).queryInterfaceTo(osType.asOutParam());
+            aGuestOSTypes.push_back(osType);
+        }
+    }
+
     return S_OK;
 }