Changeset 102282 in vbox

Timestamp:

Nov 23, 2023 7:52:48 PM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10543: A bit of rework for UIGuestOSType; Make sure only supported guest OS types enumerated on per architecture basis.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICommon.cpp (modified) (2 diffs)
• UIGuestOSType.cpp (modified) (1 diff)
• UIGuestOSType.h (modified) (1 diff)

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

@@ -1411 +1411 @@
     {
         m_pGuestOSTypeManager = new UIGuestOSTypeManager;
-        m_pGuestOSTypeManager->reCacheGuestOSTypes(m_comVBox.GetGuestOSTypes());
+        m_pGuestOSTypeManager->reCacheGuestOSTypes();
     }
 
@@ -2972 +2972 @@
     /* Re-initialize guest OS type database: */
     if (m_pGuestOSTypeManager)
-        m_pGuestOSTypeManager->reCacheGuestOSTypes(m_comVBox.GetGuestOSTypes());
+        m_pGuestOSTypeManager->reCacheGuestOSTypes();
 
     /* Mark wrappers valid: */

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

@@ -32 +32 @@
 /* COM includes: */
 #include "CGuestOSType.h"
-
-
-void UIGuestOSTypeManager::reCacheGuestOSTypes(const CGuestOSTypeVector &guestOSTypes)
-{
+#include "CPlatformProperties.h"
+#include "CSystemProperties.h"
+
+
+void UIGuestOSTypeManager::reCacheGuestOSTypes()
+{
+    /* Acquire a list of guest OS types supported by this host: */
+    CGuestOSTypeVector guestOSTypes;
+    CSystemProperties comSysProps = uiCommon().virtualBox().GetSystemProperties();
+    foreach (const KPlatformArchitecture &enmArch, comSysProps.GetSupportedPlatformArchitectures())
+    {
+        CPlatformProperties comPlatProps = uiCommon().virtualBox().GetPlatformProperties(enmArch);
+        guestOSTypes += comPlatProps.GetSupportedGuestOSTypes();
+    }
+
+    /* Wipe out cache: */
     m_typeIdIndexMap.clear();
     m_guestOSTypes.clear();

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

@@ -109 +109 @@
 
     /** Re-create the guest OS type database. */
-    void reCacheGuestOSTypes(const CGuestOSTypeVector &guestOSTypes);
+    void reCacheGuestOSTypes();
 
     /** Returns a list of all families (id and description). */