Changeset 105519 in vbox for trunk

Timestamp:

Jul 26, 2024 10:19:58 AM (6 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10543: If one of unsupported OS types chosen by a 3rd parties for particular VM, we have to make sure it's reflected in VM settings as the only possible family/subtype/type as a fallback solution; Fixing corresponding assertion as GUI was going crazy detecting unsupported types.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UIGuestOSType.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIGuestOSType.cpp

@@ -224 +224 @@
                                   KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
-    /* Otherwise we'll have to prepare list by arch type: */
+    /* Prepare family list: */
     UIGuestOSTypeManager::UIGuestOSFamilyInfo families;
     foreach (const UIFamilyInfo &fi, m_guestOSFamilies)
     {
+        /* Always include family which was asked for: */
+        if (including.contains(fi.m_strId))
+        {
+            families << fi;
+            continue;
+        }
+
+        /* Skip everyting if requested arch type is NOT supported: */
+        if (   enmArch != KPlatformArchitecture_None
+            && !m_supportedArchTypes.contains(enmArch))
+            continue;
+
+        /* Skip unsupported families if there was no request to show all: */
         if (   !fListAll
-            && !fi.m_fSupported
-            && !including.contains(fi.m_strId))
-            continue;
+            && !fi.m_fSupported)
+            continue;
+
         const KPlatformArchitecture enmCurrentArch = fi.m_enmArch;
         if (   enmCurrentArch == enmArch
@@ -247 +260 @@
                                              KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
-    /* Otherwise we'll have to prepare list by arch type: */
+    /* Prepare subtype list: */
     UIGuestOSSubtypeInfo subtypes;
     foreach (const UISubtypeInfo &si, m_guestOSSubtypes.value(strFamilyId))
     {
+        /* Always include subtype which was asked for: */
+        if (including.contains(si.m_strName))
+        {
+            subtypes << si;
+            continue;
+        }
+
+        /* Skip everyting if requested arch type is NOT supported: */
+        if (   enmArch != KPlatformArchitecture_None
+            && !m_supportedArchTypes.contains(enmArch))
+            continue;
+
+        /* Skip unsupported subtypes if there was no request to show all: */
         if (   !fListAll
-            && !si.m_fSupported
-            && !including.contains(si.m_strName))
-            continue;
+            && !si.m_fSupported)
+            continue;
+
         const KPlatformArchitecture enmCurrentArch = si.m_enmArch;
         if (   enmCurrentArch == enmArch
@@ -275 +301 @@
     foreach (const UIGuestOSType &type, m_guestOSTypes)
     {
-        if (   !fListAll
-            && !type.isSupported()
-            && !including.contains(type.getId()))
-            continue;
-        if (type.getFamilyId() != strFamilyId)
-            continue;
+        /* Check for redundant type: */
         QPair<QString, QString> info(type.getId(), type.getDescription());
         if (typeInfoList.contains(info))
             continue;
+
+        /* Always include subtype which was asked for: */
+        if (including.contains(type.getId()))
+        {
+            typeInfoList << info;
+            continue;
+        }
+
+        /* Skip unsupported types if there was no request to show all: */
+        if (   !fListAll
+            && !type.isSupported())
+            continue;
+
+        /* Skip types of different family: */
+        if (type.getFamilyId() != strFamilyId)
+            continue;
+
         if (   enmArch == KPlatformArchitecture_None
             || type.getPlatformArchitecture() == enmArch)
@@ -302 +340 @@
     foreach (const UIGuestOSType &type, m_guestOSTypes)
     {
-        if (   !fListAll
-            && !type.isSupported()
-            && !including.contains(type.getId()))
-            continue;
-        if (type.getSubtype() != strSubtype)
-            continue;
+        /* Check for redundant type: */
         QPair<QString, QString> info(type.getId(), type.getDescription());
         if (typeInfoList.contains(info))
             continue;
+
+        /* Always include subtype which was asked for: */
+        if (including.contains(type.getId()))
+        {
+            typeInfoList << info;
+            continue;
+        }
+
+        /* Skip unsupported types if there was no request to show all: */
+        if (   !fListAll
+            && !type.isSupported())
+            continue;
+
+        /* Skip types of different subtype: */
+        if (type.getSubtype() != strSubtype)
+            continue;
+
         if (   enmArch == KPlatformArchitecture_None
             || type.getPlatformArchitecture() == enmArch)