Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp	(revision 33922)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp	(revision 33923)
@@ -902,15 +902,4 @@
     else
         return QModelIndex();
-}
-
-KChipsetType StorageModel::getChipsetType() const
-{
-#if 0
-    CMachine mach = vboxGlobal().virtualBox().FindMachine(mRootItem->machineId());
-    Assert(!mach.isNull());
-    return mach.GetChipsetType();
-#else
-    return KChipsetType_PIIX3;
-#endif
 }
 
@@ -1034,25 +1023,25 @@
         {
             return static_cast <RootItem*> (mRootItem)->childCount (KStorageBus_IDE) <
-                    vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (getChipsetType(), KStorageBus_IDE);
+                    vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (chipsetType(), KStorageBus_IDE);
         }
         case R_IsMoreSATAControllersPossible:
         {
             return static_cast <RootItem*> (mRootItem)->childCount (KStorageBus_SATA) <
-                   vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (getChipsetType(), KStorageBus_SATA);
+                   vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (chipsetType(), KStorageBus_SATA);
         }
         case R_IsMoreSCSIControllersPossible:
         {
             return static_cast <RootItem*> (mRootItem)->childCount (KStorageBus_SCSI) <
-                   vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (getChipsetType(), KStorageBus_SCSI);
+                   vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (chipsetType(), KStorageBus_SCSI);
         }
         case R_IsMoreFloppyControllersPossible:
         {
             return static_cast <RootItem*> (mRootItem)->childCount (KStorageBus_Floppy) <
-                   vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (getChipsetType(), KStorageBus_Floppy);
+                   vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (chipsetType(), KStorageBus_Floppy);
         }
         case R_IsMoreSASControllersPossible:
         {
             return static_cast <RootItem*> (mRootItem)->childCount (KStorageBus_SAS) <
-                   vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (getChipsetType(), KStorageBus_SAS);
+                   vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (chipsetType(), KStorageBus_SAS);
         }
         case R_IsMoreAttachmentsPossible:
@@ -1522,4 +1511,11 @@
     return !aIndex.isValid() ? QAbstractItemModel::flags (aIndex) :
            Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+}
+
+KChipsetType StorageModel::chipsetType() const
+{
+    CMachine machine = vboxGlobal().virtualBox().FindMachine(mRootItem->machineId());
+    Assert(!machine.isNull());
+    return machine.GetChipsetType();
 }
 
@@ -1788,7 +1784,4 @@
     connect (mCbPassthrough, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
 
-    /* Update actions */
-    updateActionsState();
-
     /* Applying language settings */
     retranslateUi();
@@ -1880,4 +1873,7 @@
     if (mStorageModel->rowCount(mStorageModel->root()) > 0)
         mTwStorageTree->setCurrentIndex(mStorageModel->index(0, 0, mStorageModel->root()));
+
+    /* Update actions: */
+    updateActionsState();
 
     /* Revalidate if possible: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h	(revision 33922)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h	(revision 33923)
@@ -502,4 +502,6 @@
     Qt::ItemFlags flags (const QModelIndex &aIndex) const;
 
+    KChipsetType chipsetType() const;
+
     AbstractItem *mRootItem;
 
@@ -511,6 +513,4 @@
 
     ToolTipType mToolTipType;
-
-    KChipsetType getChipsetType() const;
 };
 Q_DECLARE_METATYPE (StorageModel::ToolTipType);