Changeset 29218 in vbox for trunk/src/VBox/Main/xml/Settings.cpp

Timestamp:

May 7, 2010 2:52:27 PM (15 years ago)

Author:

vboxsync

Message:

Main/Settings: Drop global iomgr and iobackend settings

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (4 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1630 +1630 @@
 IoSettings::IoSettings()
 {
-    ioMgrType        = IoMgrType_Async;
-    ioBackendType    = IoBackendType_Unbuffered;
     fIoCacheEnabled  = true;
     ulIoCacheSize    = 5;
@@ -2514 +2512 @@
         else if (pelmHwChild->nameEquals("IO"))
         {
-            Utf8Str strTemp;
             const xml::ElementNode *pelmIoChild;
 
-            if ((pelmIoChild = pelmHwChild->findChildElement("IoMgr")))
-            {
-                if (pelmIoChild->getAttributeValue("type", strTemp))
-                {
-                    if (strTemp == "Async")
-                        hw.ioSettings.ioMgrType = IoMgrType_Async;
-                    else if (strTemp == "Simple")
-                        hw.ioSettings.ioMgrType = IoMgrType_Simple;
-                    else
-                        throw ConfigFileError(this, pelmIoChild, N_("Invalid value '%s' in IoMgr/@type attribute"), strTemp.c_str());
-                }
-            }
-
-            if ((pelmIoChild = pelmHwChild->findChildElement("IoBackend")))
-            {
-                if (pelmIoChild->getAttributeValue("type", strTemp))
-                {
-                    if (strTemp == "Unbuffered")
-                        hw.ioSettings.ioBackendType = IoBackendType_Unbuffered;
-                    else if (strTemp == "Buffered")
-                        hw.ioSettings.ioBackendType = IoBackendType_Buffered;
-                    else
-                        throw ConfigFileError(this, pelmIoChild, N_("Invalid value '%s' in IoBackend/@type attribute"), strTemp.c_str());
-                }
-            }
             if ((pelmIoChild = pelmHwChild->findChildElement("IoCache")))
             {
@@ -3553 +3525 @@
         const char *pcszTemp;
 
-        switch (hw.ioSettings.ioMgrType)
-        {
-            case IoMgrType_Simple: pcszTemp = "Simple"; break;
-            case IoMgrType_Async:
-            default:
-                pcszTemp = "Async"; break;
-        }
-
-        pelmIo->createChild("IoMgr")->setAttribute("type", pcszTemp);
-
-        switch (hw.ioSettings.ioBackendType)
-        {
-            case IoBackendType_Buffered: pcszTemp = "Buffered"; break;
-            case IoBackendType_Unbuffered:
-            default:
-                pcszTemp = "Unbuffered"; break;
-        }
-
-        pelmIo->createChild("IoBackend")->setAttribute("type", pcszTemp);
-
         pelmIoCache = pelmIo->createChild("IoCache");
         pelmIoCache->setAttribute("enabled", hw.ioSettings.fIoCacheEnabled);
@@ -4086 +4038 @@
         if (   hardwareMachine.ioSettings.fIoCacheEnabled != true
             || hardwareMachine.ioSettings.ulIoCacheSize != 5
-            || hardwareMachine.ioSettings.ulIoBandwidthMax != 0
-            || hardwareMachine.ioSettings.ioMgrType != IoMgrType_Async
-            || hardwareMachine.ioSettings.ioBackendType != IoBackendType_Unbuffered)
+            || hardwareMachine.ioSettings.ulIoBandwidthMax != 0)
             m->sv = SettingsVersion_v1_10;
     }