Changeset 28804 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 27, 2010 9:54:17 AM (15 years ago)

Author:

vboxsync

Message:

FE/VirtualBox: Expose I/O cache setting

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/vm/VBoxVMSettingsHD.cpp (modified) (10 diffs)
• settings/vm/VBoxVMSettingsHD.h (modified) (3 diffs)
• settings/vm/VBoxVMSettingsHD.ui (modified) (1 diff)
• wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.cpp

@@ -406 +406 @@
     , mCtrName (aName)
     , mCtrType (0)
+    , mUseIoCache (true)
 {
     /* Check for proper parent type */
@@ -461 +462 @@
 }
 
+bool ControllerItem::ctrUseIoCache() const
+{
+    return mUseIoCache;
+}
+
 void ControllerItem::setCtrName (const QString &aCtrName)
 {
@@ -469 +475 @@
 {
     mCtrType->setCtrType (aCtrType);
+}
+
+void ControllerItem::setCtrUseIoCache (bool aUseIoCache)
+{
+    mUseIoCache = aUseIoCache;
 }
 
@@ -1101 +1112 @@
             return result;
         }
+        case R_CtrIoCache:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_ControllerItem)
+                    return static_cast <ControllerItem*> (item)->ctrUseIoCache();
+            return false;
+        }
 
         case R_AttSlot:
@@ -1295 +1313 @@
                 {
                     static_cast <ControllerItem*> (item)->setCtrType (aValue.value <KStorageControllerType>());
+                    emit dataChanged (aIndex, aIndex);
+                    return true;
+                }
+            return false;
+        }
+        case R_CtrIoCache:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_ControllerItem)
+                {
+                    static_cast <ControllerItem*> (item)->setCtrUseIoCache (aValue.toBool());
                     emit dataChanged (aIndex, aIndex);
                     return true;
@@ -1672 +1701 @@
     connect (mCbType, SIGNAL (activated (int)), this, SLOT (setInformation()));
     connect (mCbSlot, SIGNAL (activated (int)), this, SLOT (setInformation()));
+    connect (mCbIoCache, SIGNAL (stateChanged (int)), this, SLOT (setInformation()));
     connect (mCbVdi, SIGNAL (activated (int)), this, SLOT (setInformation()));
     connect (mTbVmm, SIGNAL (clicked (bool)), this, SLOT (onVmmInvoked()));
@@ -1703 +1733 @@
         QModelIndex ctrIndex = mStorageModel->addController (controllerName, controller.GetBus(), controller.GetControllerType());
         QUuid ctrId = QUuid (mStorageModel->data (ctrIndex, StorageModel::R_ItemId).toString());
+
+        bool useIoCache = true;
+        if (controller.GetIoBackend() == KIoBackendType_Unbuffered)
+            useIoCache = false;
+
+        mStorageModel->setData (ctrIndex, useIoCache, StorageModel::R_CtrIoCache);
 
         CMediumAttachmentVector attachments = mMachine.GetMediumAttachmentsOfController (controllerName);
@@ -1743 +1779 @@
         KStorageBus ctrBusType = mStorageModel->data (ctrIndex, StorageModel::R_CtrBusType).value <KStorageBus>();
         KStorageControllerType ctrType = mStorageModel->data (ctrIndex, StorageModel::R_CtrType).value <KStorageControllerType>();
+        bool useIoCache = mStorageModel->data (ctrIndex, StorageModel::R_CtrIoCache).toBool();
         CStorageController ctr = mMachine.AddStorageController (ctrName, ctrBusType);
         ctr.SetControllerType (ctrType);
+        ctr.SetIoBackend(useIoCache ? KIoBackendType_Buffered : KIoBackendType_Unbuffered);
         int maxUsedPort = -1;
         for (int j = 0; j < mStorageModel->rowCount (ctrIndex); ++ j)
@@ -2070 +2108 @@
                 mCbType->setCurrentIndex (ctrPos == -1 ? 0 : ctrPos);
 
+                bool isUseIoCache = mStorageModel->data (index, StorageModel::R_CtrIoCache).toBool();
+                mCbIoCache->setChecked(isUseIoCache);
+
                 /* Showing Controller Page */
                 mSwRightPane->setCurrentIndex (1);
@@ -2160 +2201 @@
                 mStorageModel->setData (index, QVariant::fromValue (vboxGlobal().toControllerType (mCbType->currentText())),
                                         StorageModel::R_CtrType);
+            else if (sdr == mCbIoCache)
+                mStorageModel->setData (index, mCbIoCache->isChecked(), StorageModel::R_CtrIoCache);
             break;
         }

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.h

@@ -297 +297 @@
     KStorageControllerType ctrType() const;
     ControllerTypeList ctrTypes() const;
+    bool ctrUseIoCache() const;
 
     void setCtrName (const QString &aCtrName);
     void setCtrType (KStorageControllerType aCtrType);
+    void setCtrUseIoCache (bool aUseIoCache);
 
     SlotsList ctrAllSlots() const;
@@ -322 +324 @@
     QString mCtrName;
     AbstractControllerType *mCtrType;
+    bool mUseIoCache;
     QList <AbstractItem*> mAttachments;
 };
@@ -419 +422 @@
         R_CtrDevices,
         R_CtrBusType,
+        R_CtrIoCache,
 
         R_AttSlot,

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.ui

@@ -209 +209 @@
          </widget>
         </item>
-        <item row="3" column="0" colspan="3" >
+        <item row="3" column="2" >
+         <widget class="QCheckBox" name="mCbIoCache" >
+          <property name="whatsThis" >
+           <string>Allows to use host I/O caching capabilities.</string>
+          </property>
+          <property name="text" >
+           <string>Use host I/O cache</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0" colspan="3" >
          <spacer name="mSp3" >
           <property name="orientation" >

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -668 +668 @@
     /* Create default storage controllers */
     QString ctrName = VBoxVMSettingsHD::tr("Storage Controller");
-    KStorageBus ideBus = KStorageBus_IDE;
+    KStorageBus storageBus = type.GetRecommendedStorageBus();
 
     // Add storage controller
-    m_Machine.AddStorageController(ctrName, ideBus);
+    m_Machine.AddStorageController(ctrName, storageBus);
 
     // Set storage controller type