Changeset 38151 in vbox for trunk

Timestamp:

Jul 25, 2011 11:47:29 AM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Machine settings / Storage page: More strict error-check procedure on settings saving, minor bug-fixes.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (modified) (20 diffs)

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

@@ -3204 +3204 @@
         {
             /* For each controller (removing step): */
-            for (int iControllerIndex = 0; iControllerIndex < m_cache.childCount(); ++iControllerIndex)
+            for (int iControllerIndex = 0; fSuccess && iControllerIndex < m_cache.childCount(); ++iControllerIndex)
             {
                 /* Get controller cache: */
@@ -3212 +3212 @@
                 if (controllerCache.wasRemoved() || (controllerCache.wasUpdated() && !isControllerCouldBeUpdated(controllerCache)))
                     fSuccess = removeStorageController(controllerCache);
+
+                else
 
                 /* Update controllers marked for 'update' (if they can be updated): */
@@ -3217 +3219 @@
                 {
                     /* For each attachment (removing step): */
-                    for (int iAttachmentIndex = 0; iAttachmentIndex < controllerCache.childCount(); ++iAttachmentIndex)
+                    for (int iAttachmentIndex = 0; fSuccess && iAttachmentIndex < controllerCache.childCount(); ++iAttachmentIndex)
                     {
                         /* Get attachment cache: */
@@ -3228 +3230 @@
                 }
             }
+
             /* For each controller (creating step): */
-            for (int iControllerIndex = 0; iControllerIndex < m_cache.childCount(); ++iControllerIndex)
+            for (int iControllerIndex = 0; fSuccess && iControllerIndex < m_cache.childCount(); ++iControllerIndex)
             {
                 /* Get controller cache: */
-                UICacheSettingsMachineStorageController controllerCache = m_cache.child(iControllerIndex);
+                const UICacheSettingsMachineStorageController &controllerCache = m_cache.child(iControllerIndex);
 
                 /* Create controllers marked for 'create' or 'update' (if they can't be updated): */
                 if (controllerCache.wasCreated() || (controllerCache.wasUpdated() && !isControllerCouldBeUpdated(controllerCache)))
                     fSuccess = createStorageController(controllerCache);
+
+                else
 
                 /* Update controllers marked for 'update' (if they can be updated): */
@@ -3264 +3269 @@
         /* Check that machine is OK: */
         fSuccess = m_machine.isOk();
+        /* If controller exists: */
         if (fSuccess && !controller.isNull())
         {
@@ -3270 +3276 @@
             /* For each storage attachment: */
             for (int iAttachmentIndex = 0; fSuccess && iAttachmentIndex < controllerCache.childCount(); ++iAttachmentIndex)
-                fSuccess = removeStorageAttachment(controllerCache, controllerCache.child(iAttachmentIndex));
+            {
+                /* Get attachment cache: */
+                const UICacheSettingsMachineStorageAttachment &attachmentCache = controllerCache.child(iAttachmentIndex);
+
+                /* Remove attachment if it was not just 'created': */
+                if (!attachmentCache.wasCreated())
+                    fSuccess = removeStorageAttachment(controllerCache, attachmentCache);
+            }
             /* Remove storage controller finally: */
             if (fSuccess)
@@ -3305 +3318 @@
         fSuccess = !m_machine.isOk();
         /* If controller doesn't exists: */
-        if (controller.isNull())
+        if (fSuccess && controller.isNull())
         {
             /* Create new storage controller: */
@@ -3311 +3324 @@
             /* Check that machine is OK: */
             fSuccess = m_machine.isOk();
-            if (!controller.isNull())
+            /* If controller exists: */
+            if (fSuccess && !controller.isNull())
             {
                 /* Set storage controller attributes: */
                 controller.SetControllerType(controllerType);
                 controller.SetUseHostIOCache(fUseHostIOCache);
-                if (controllerData.m_controllerBus == KStorageBus_SATA)
+                if (controllerBus == KStorageBus_SATA)
                 {
                     uPortCount = qMax(uPortCount, controller.GetMinPortCount());
@@ -3322 +3336 @@
                     controller.SetPortCount(uPortCount);
                 }
-
                 /* For each storage attachment: */
                 for (int iAttachmentIndex = 0; fSuccess && iAttachmentIndex < controllerCache.childCount(); ++iAttachmentIndex)
@@ -3329 +3342 @@
                     const UICacheSettingsMachineStorageAttachment &attachmentCache = controllerCache.child(iAttachmentIndex);
 
-                    /* If storage attachment data was not removed: */
+                    /* Create attachment if it was not just 'removed': */
                     if (!attachmentCache.wasRemoved())
                         fSuccess = createStorageAttachment(controllerCache, attachmentCache);
@@ -3360 +3373 @@
         /* Check that machine is OK: */
         fSuccess = m_machine.isOk();
-        if (!controller.isNull())
+        /* If controller exists: */
+        if (fSuccess && !controller.isNull())
         {
             /* Set storage controller attributes: */
             controller.SetControllerType(controllerType);
             controller.SetUseHostIOCache(fUseHostIOCache);
-            if (controllerData.m_controllerBus == KStorageBus_SATA)
+            if (controllerBus == KStorageBus_SATA)
             {
                 uPortCount = qMax(uPortCount, controller.GetMinPortCount());
@@ -3371 +3385 @@
                 controller.SetPortCount(uPortCount);
             }
-
             /* For each storage attachment: */
             for (int iAttachmentIndex = 0; fSuccess && iAttachmentIndex < controllerCache.childCount(); ++iAttachmentIndex)
@@ -3382 +3395 @@
                     fSuccess = createStorageAttachment(controllerCache, attachmentCache);
 
+                else
+
                 /* Update attachments marked for 'update' (if they can be updated): */
                 if (attachmentCache.wasUpdated() && isAttachmentCouldBeUpdated(attachmentCache))
@@ -3414 +3429 @@
         /* Check that machine is OK: */
         fSuccess = m_machine.isOk();
+        /* If attachment exists: */
         if (fSuccess && !attachment.isNull())
         {
@@ -3458 +3474 @@
         /* Check that machine is not OK: */
         fSuccess = !m_machine.isOk();
-        if (attachment.isNull())
+        /* If attachment doesn't exists: */
+        if (fSuccess && attachment.isNull())
         {
             /* Create storage attachment: */
@@ -3468 +3485 @@
                 if (attachmentDeviceType == KDeviceType_DVD)
                 {
-                    m_machine.PassthroughDevice(strControllerName, iAttachmentPort, iAttachmentDevice, fAttachmentPassthrough);
-                    /* Check that machine is OK: */
-                    fSuccess = m_machine.isOk();
+                    if (fSuccess)
+                    {
+                        m_machine.PassthroughDevice(strControllerName, iAttachmentPort, iAttachmentDevice, fAttachmentPassthrough);
+                        /* Check that machine is OK: */
+                        fSuccess = m_machine.isOk();
+                    }
                     if (fSuccess)
                     {
@@ -3526 +3546 @@
         /* Check that machine is OK: */
         fSuccess = m_machine.isOk();
-        if (!attachment.isNull())
+        /* If attachment exists: */
+        if (fSuccess && !attachment.isNull())
         {
             /* Get GUI medium object: */
@@ -3538 +3559 @@
             if (fSuccess)
             {
-                if (isMachineOffline())
+                if (attachmentDeviceType == KDeviceType_DVD)
                 {
-                    if (attachmentDeviceType == KDeviceType_DVD)
+                    if (fSuccess && isMachineOffline())
                     {
                         m_machine.PassthroughDevice(strControllerName, iAttachmentPort, iAttachmentDevice, fAttachmentPassthrough);
@@ -3546 +3567 @@
                         fSuccess = m_machine.isOk();
                     }
-                }
-                if (fSuccess)
-                {
-                    if (attachmentDeviceType == KDeviceType_DVD)
+                    if (fSuccess && isMachineInValidMode())
                     {
                         m_machine.TemporaryEjectDevice(strControllerName, iAttachmentPort, iAttachmentDevice, fAttachmentTempEject);
@@ -3556 +3574 @@
                     }
                 }
-                if (fSuccess)
+                else if (attachmentDeviceType == KDeviceType_HardDisk)
                 {
-                    if (attachmentDeviceType == KDeviceType_HardDisk)
+                    if (fSuccess && isMachineOffline())
                     {
                         m_machine.NonRotationalDevice(strControllerName, iAttachmentPort, iAttachmentDevice, fAttachmentNonRotational);