Changeset 79963 in vbox

Timestamp:

Jul 24, 2019 6:21:31 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7720: VM settings / System page: Cleanup for boot item load/save procedures.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsSystem.cpp (modified) (6 diffs)
• UIMachineSettingsSystem.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -107 +107 @@
 
     /** Holds the RAM size. */
-    int                    m_iMemorySize;
+    int                 m_iMemorySize;
     /** Holds the boot items. */
-    UIBootItemDataList     m_bootItems;
+    UIBootItemDataList  m_bootItems;
     /** Holds the chipset type. */
-    KChipsetType           m_chipsetType;
+    KChipsetType        m_chipsetType;
     /** Holds the pointing HID type. */
-    KPointingHIDType       m_pointingHIDType;
+    KPointingHIDType    m_pointingHIDType;
     /** Holds whether the IO APIC is enabled. */
-    bool                   m_fEnabledIoApic;
+    bool                m_fEnabledIoApic;
     /** Holds whether the EFI is enabled. */
-    bool                   m_fEnabledEFI;
+    bool                m_fEnabledEFI;
     /** Holds whether the UTC is enabled. */
-    bool                   m_fEnabledUTC;
+    bool                m_fEnabledUTC;
 
     /** Holds the CPU count. */
@@ -235 +235 @@
     /* Gather old 'Motherboard' data: */
     oldSystemData.m_iMemorySize = m_machine.GetMemorySize();
+    oldSystemData.m_bootItems = loadBootItems(m_machine);
     oldSystemData.m_chipsetType = m_machine.GetChipsetType();
     oldSystemData.m_pointingHIDType = m_machine.GetPointingHIDType();
@@ -240 +241 @@
     oldSystemData.m_fEnabledEFI = m_machine.GetFirmwareType() >= KFirmwareType_EFI && m_machine.GetFirmwareType() <= KFirmwareType_EFIDUAL;
     oldSystemData.m_fEnabledUTC = m_machine.GetRTCUseUTC();
-    /* Gather boot-items of current VM: */
-    QList<KDeviceType> usedBootItems;
-    for (int i = 1; i <= m_possibleBootItems.size(); ++i)
-    {
-        KDeviceType type = m_machine.GetBootOrder(i);
-        if (type != KDeviceType_Null)
-        {
-            usedBootItems << type;
-            UIBootItemData data;
-            data.m_enmType = type;
-            data.m_fEnabled = true;
-            oldSystemData.m_bootItems << data;
-        }
-    }
-    /* Gather other unique boot-items: */
-    for (int i = 0; i < m_possibleBootItems.size(); ++i)
-    {
-        KDeviceType type = m_possibleBootItems[i];
-        if (!usedBootItems.contains(type))
-        {
-            UIBootItemData data;
-            data.m_enmType = type;
-            data.m_fEnabled = false;
-            oldSystemData.m_bootItems << data;
-        }
-    }
 
     /* Gather old 'Processor' data: */
@@ -1170 +1145 @@
 }
 
+UIBootItemDataList UIMachineSettingsSystem::loadBootItems(const CMachine &comMachine)
+{
+    /* Prepare boot items: */
+    UIBootItemDataList bootItems;
+
+    /* Gather boot-items of current VM: */
+    QList<KDeviceType> usedBootItems;
+    for (int i = 1; i <= m_possibleBootItems.size(); ++i)
+    {
+        const KDeviceType enmType = comMachine.GetBootOrder(i);
+        if (enmType != KDeviceType_Null)
+        {
+            usedBootItems << enmType;
+            UIBootItemData data;
+            data.m_enmType = enmType;
+            data.m_fEnabled = true;
+            bootItems << data;
+        }
+    }
+    /* Gather other unique boot-items: */
+    for (int i = 0; i < m_possibleBootItems.size(); ++i)
+    {
+        const KDeviceType enmType = m_possibleBootItems[i];
+        if (!usedBootItems.contains(enmType))
+        {
+            UIBootItemData data;
+            data.m_enmType = enmType;
+            data.m_fEnabled = false;
+            bootItems << data;
+        }
+    }
+
+    /* Return boot items: */
+    return bootItems;
+}
+
+void UIMachineSettingsSystem::saveBootItems(const UIBootItemDataList &bootItems, CMachine &comMachine)
+{
+    bool fSuccess = true;
+    int iBootIndex = 0;
+    for (int i = 0; fSuccess && i < bootItems.size(); ++i)
+    {
+        if (bootItems.at(i).m_fEnabled)
+        {
+            comMachine.SetBootOrder(++iBootIndex, bootItems.at(i).m_enmType);
+            fSuccess = comMachine.isOk();
+        }
+    }
+    for (int i = 0; fSuccess && i < bootItems.size(); ++i)
+    {
+        if (!bootItems.at(i).m_fEnabled)
+        {
+            comMachine.SetBootOrder(++iBootIndex, KDeviceType_Null);
+            fSuccess = comMachine.isOk();
+        }
+    }
+}
+
 bool UIMachineSettingsSystem::saveSystemData()
 {
@@ -1209 +1242 @@
             fSuccess = m_machine.isOk();
         }
+        /* Save boot items: */
+        if (fSuccess && isMachineOffline() && newSystemData.m_bootItems != oldSystemData.m_bootItems)
+        {
+            saveBootItems(newSystemData.m_bootItems, m_machine);
+            fSuccess = m_machine.isOk();
+        }
         /* Save chipset type: */
         if (fSuccess && isMachineOffline() && newSystemData.m_chipsetType != oldSystemData.m_chipsetType)
@@ -1238 +1277 @@
             m_machine.SetRTCUseUTC(newSystemData.m_fEnabledUTC);
             fSuccess = m_machine.isOk();
-        }
-        /* Save boot items: */
-        if (fSuccess && isMachineOffline() && newSystemData.m_bootItems != oldSystemData.m_bootItems)
-        {
-            int iBootIndex = 0;
-            for (int i = 0; fSuccess && i < newSystemData.m_bootItems.size(); ++i)
-            {
-                if (newSystemData.m_bootItems.at(i).m_fEnabled)
-                {
-                    m_machine.SetBootOrder(++iBootIndex, newSystemData.m_bootItems.at(i).m_enmType);
-                    fSuccess = m_machine.isOk();
-                }
-            }
-            for (int i = 0; fSuccess && i < newSystemData.m_bootItems.size(); ++i)
-            {
-                if (!newSystemData.m_bootItems.at(i).m_fEnabled)
-                {
-                    m_machine.SetBootOrder(++iBootIndex, KDeviceType_Null);
-                    fSuccess = m_machine.isOk();
-                }
-            }
         }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

@@ -29 +29 @@
 struct UIDataSettingsMachineSystem;
 typedef UISettingsCache<UIDataSettingsMachineSystem> UISettingsCacheMachineSystem;
+class CMachine;
 
 /** Machine settings: System page. */
@@ -150 +151 @@
     /** Adjusts boot-order tree-widget size. */
     void adjustBootOrderTWSize();
+    /** Loads boot item list for passed @a comMachine. */
+    UIBootItemDataList loadBootItems(const CMachine &comMachine);
+    /** Saves @a bootItems list to passed @a comMachine. */
+    void saveBootItems(const UIBootItemDataList &bootItems, CMachine &comMachine);
 
     /** Saves existing system data from the cache. */