Changeset 58360 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 21, 2015 2:18:26 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: VBoxGlobal: Missed COM wrappers to be recreated on VBoxSVC restart.

Location:

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

Files:

• VBoxGlobal.cpp (modified) (9 diffs)
• VBoxGlobal.h (modified) (3 diffs)

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

@@ -632 +632 @@
 {
     QList<CGuestOSType> result;
-    for (int i = 0; i < mFamilyIDs.size(); ++i)
-        result << mTypes[i][0];
+    for (int i = 0; i < m_guestOSFamilyIDs.size(); ++i)
+        result << m_guestOSTypes[i][0];
     return result;
 }
@@ -643 +643 @@
 QList<CGuestOSType> VBoxGlobal::vmGuestOSTypeList(const QString &aFamilyId) const
 {
-    AssertMsg(mFamilyIDs.contains(aFamilyId), ("Family ID incorrect: '%s'.", aFamilyId.toLatin1().constData()));
-    return mFamilyIDs.contains(aFamilyId) ?
-           mTypes[mFamilyIDs.indexOf(aFamilyId)] : QList<CGuestOSType>();
+    AssertMsg(m_guestOSFamilyIDs.contains(aFamilyId), ("Family ID incorrect: '%s'.", aFamilyId.toLatin1().constData()));
+    return m_guestOSFamilyIDs.contains(aFamilyId) ?
+           m_guestOSTypes[m_guestOSFamilyIDs.indexOf(aFamilyId)] : QList<CGuestOSType>();
 }
 
@@ -693 +693 @@
 {
     QList <CGuestOSType> list;
-    if (mFamilyIDs.contains (aFamilyId))
-    {
-        list = mTypes [mFamilyIDs.indexOf (aFamilyId)];
+    if (m_guestOSFamilyIDs.contains (aFamilyId))
+    {
+        list = m_guestOSTypes [m_guestOSFamilyIDs.indexOf (aFamilyId)];
     }
     else
     {
-        for (int i = 0; i < mFamilyIDs.size(); ++ i)
-            list += mTypes [i];
+        for (int i = 0; i < m_guestOSFamilyIDs.size(); ++ i)
+            list += m_guestOSTypes [i];
     }
     for (int j = 0; j < list.size(); ++ j)
@@ -714 +714 @@
 QString VBoxGlobal::vmGuestOSTypeDescription (const QString &aTypeId) const
 {
-    for (int i = 0; i < mFamilyIDs.size(); ++ i)
-    {
-        QList <CGuestOSType> list (mTypes [i]);
+    for (int i = 0; i < m_guestOSFamilyIDs.size(); ++ i)
+    {
+        QList <CGuestOSType> list (m_guestOSTypes [i]);
         for ( int j = 0; j < list.size(); ++ j)
             if (!list [j].GetId().compare (aTypeId))
@@ -4007 +4007 @@
         return;
     }
-    /* Fetch corresponding objects/values: */
-    m_vbox = virtualBoxClient().GetVirtualBox();
-    m_host = virtualBox().GetHost();
-    m_strHomeFolder = virtualBox().GetHomeFolder();
-    /* Mark wrappers valid: */
-    m_fWrappersValid = true;
+    /* Init wrappers: */
+    comWrappersReinit();
 
     /* Watch for the VBoxSVC availability changes: */
@@ -4041 +4037 @@
     connect(gEDataManager, SIGNAL(sigLanguageChange(QString)),
             this, SLOT(sltGUILanguageChange(QString)));
-
-    /* Initialize guest OS Type list. */
-    CGuestOSTypeVector coll = m_vbox.GetGuestOSTypes();
-    int osTypeCount = coll.size();
-    AssertMsg(osTypeCount > 0, ("Number of OS types must not be zero"));
-    if (osTypeCount > 0)
-    {
-        /* Here we ASSUME the 'Other' types are always the first, so we
-         * remember it and will append it to the list when finished.
-         * We do a two pass, first adding the specific types, then the two
-         * 'Other' types. */
-        for (int j = 0; j < 2; j++)
-        {
-            int cMax = j == 0 ? coll.size() : RT_MIN(2, coll.size());
-            for (int i = j == 0 ? 2 : 0; i < cMax; ++i)
-            {
-                CGuestOSType os = coll[i];
-                QString familyId(os.GetFamilyId());
-                if (!mFamilyIDs.contains(familyId))
-                {
-                    mFamilyIDs << familyId;
-                    mTypes << QList<CGuestOSType>();
-                }
-                mTypes[mFamilyIDs.indexOf(familyId)].append(os);
-            }
-        }
-    }
 
     qApp->installEventFilter (this);
@@ -4419 +4388 @@
 
     /* ensure CGuestOSType objects are no longer used */
-    mFamilyIDs.clear();
-    mTypes.clear();
+    m_guestOSFamilyIDs.clear();
+    m_guestOSTypes.clear();
 
     /* Starting COM cleanup: */
@@ -4474 +4443 @@
         if (!m_fWrappersValid)
         {
-            /* Re-fetch corresponding objects/values: */
-            m_vbox = virtualBoxClient().GetVirtualBox();
-            m_host = virtualBox().GetHost();
-            m_strHomeFolder = virtualBox().GetHomeFolder();
-            /* Mark wrappers valid: */
-            m_fWrappersValid = true;
+            /* Re-init wrappers: */
+            comWrappersReinit();
 
             /* If that is Selector UI: */
@@ -4493 +4458 @@
     /* Notify listeners about the VBoxSVC availability change: */
     emit sigVBoxSVCAvailabilityChange();
+}
+
+void VBoxGlobal::comWrappersReinit()
+{
+    /* Re-fetch corresponding objects/values: */
+    m_vbox = virtualBoxClient().GetVirtualBox();
+    m_host = virtualBox().GetHost();
+    m_strHomeFolder = virtualBox().GetHomeFolder();
+
+    /* Re-initialize guest OS Type list: */
+    m_guestOSFamilyIDs.clear();
+    m_guestOSTypes.clear();
+    const CGuestOSTypeVector guestOSTypes = m_vbox.GetGuestOSTypes();
+    const int cGuestOSTypeCount = guestOSTypes.size();
+    AssertMsg(cGuestOSTypeCount > 0, ("Number of OS types must not be zero"));
+    if (cGuestOSTypeCount > 0)
+    {
+        /* Here we ASSUME the 'Other' types are always the first,
+         * so we remember them and will append them to the list when finished.
+         * We do a two pass, first adding the specific types, then the two 'Other' types. */
+        for (int j = 0; j < 2; ++j)
+        {
+            int cMax = j == 0 ? cGuestOSTypeCount : RT_MIN(2, cGuestOSTypeCount);
+            for (int i = j == 0 ? 2 : 0; i < cMax; ++i)
+            {
+                const CGuestOSType os = guestOSTypes.at(i);
+                const QString strFamilyID = os.GetFamilyId();
+                if (!m_guestOSFamilyIDs.contains(strFamilyID))
+                {
+                    m_guestOSFamilyIDs << strFamilyID;
+                    m_guestOSTypes << QList<CGuestOSType>();
+                }
+                m_guestOSTypes[m_guestOSFamilyIDs.indexOf(strFamilyID)].append(os);
+            }
+        }
+    }
+
+    /* Mark wrappers valid: */
+    m_fWrappersValid = true;
 }
 

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

@@ -515 +515 @@
     ~VBoxGlobal();
 
+    /** Re-initializes COM wrappers and containers. */
+    void comWrappersReinit();
+
 #ifdef VBOX_WITH_DEBUGGER_GUI
     void initDebuggerVar(int *piDbgCfgVar, const char *pszEnvVar, const char *pszExtraDataName, bool fDefault = false);
@@ -539 +542 @@
     /** Holds the symbolic VirtualBox home-folder representation. */
     QString m_strHomeFolder;
+    /** Holds the guest OS family IDs. */
+    QList<QString> m_guestOSFamilyIDs;
+    /** Holds the guest OS types for each family ID. */
+    QList<QList<CGuestOSType> > m_guestOSTypes;
 
     /** Holds whether acquired COM wrappers are currently valid. */
@@ -628 +635 @@
     int m3DAvailable;
 
-    QList <QString> mFamilyIDs;
-    QList <QList <CGuestOSType> > mTypes;
-
     QString mDiskTypes_Differencing;