Changeset 33524 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Oct 27, 2010 4:44:37 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67121

Message:

Storage: Implement offical support for other disk types like DVD and floppy images. DMG images can be used now without hacks

File:

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

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

@@ -671 +671 @@
             else if (strType == "SHAREABLE")
                 med.hdType = MediumType_Shareable;
+            else if (strType == "READONLY")
+                med.hdType = MediumType_Readonly;
             else
                 throw ConfigFileError(this, &elmMedium, N_("HardDisk/@type attribute must be one of Normal, Immutable or Writethrough"));
         }
     }
-    else if (m->sv < SettingsVersion_v1_4)
-    {
-        // DVD and floppy images before 1.4 had "src" attribute instead of "location"
-        if (!(elmMedium.getAttributeValue("src", med.strLocation)))
-            throw ConfigFileError(this, &elmMedium, N_("Required %s/@src attribute is missing"), elmMedium.getName());
-
-        fNeedsLocation = false;
+    else
+    {
+        if (m->sv < SettingsVersion_v1_4)
+        {
+            // DVD and floppy images before 1.4 had "src" attribute instead of "location"
+            if (!(elmMedium.getAttributeValue("src", med.strLocation)))
+                throw ConfigFileError(this, &elmMedium, N_("Required %s/@src attribute is missing"), elmMedium.getName());
+
+            fNeedsLocation = false;
+        }
+
+        if (!(elmMedium.getAttributeValue("format", med.strFormat)))
+        {
+            // DVD and floppy images before 1.11 had no format attribute. assign the default.
+            med.strFormat = "RAW";
+        }
     }
 
@@ -979 +990 @@
  * @param level
  */
-void ConfigFileBase::buildHardDisk(xml::ElementNode &elmMedium,
-                                   const Medium &mdm,
-                                   uint32_t level)          // 0 for "root" call, incremented with each recursion
-{
-    xml::ElementNode *pelmHardDisk = elmMedium.createChild("HardDisk");
-    pelmHardDisk->setAttribute("uuid", mdm.uuid.toStringCurly());
-    pelmHardDisk->setAttribute("location", mdm.strLocation);
-    pelmHardDisk->setAttribute("format", mdm.strFormat);
+void ConfigFileBase::buildMedium(xml::ElementNode &elmMedium,
+                                 DeviceType_T devType,
+                                 const Medium &mdm,
+                                 uint32_t level)          // 0 for "root" call, incremented with each recursion
+{
+    xml::ElementNode *pelmMedium;
+
+    if (devType == DeviceType_HardDisk)
+        pelmMedium = elmMedium.createChild("HardDisk");
+    else
+        pelmMedium = elmMedium.createChild("Image");
+
+    pelmMedium->setAttribute("uuid", mdm.uuid.toStringCurly());
+    pelmMedium->setAttribute("location", mdm.strLocation);
+    pelmMedium->setAttribute("format", mdm.strFormat);
     if (mdm.fAutoReset)
-        pelmHardDisk->setAttribute("autoReset", mdm.fAutoReset);
+        pelmMedium->setAttribute("autoReset", mdm.fAutoReset);
     if (mdm.strDescription.length())
-        pelmHardDisk->setAttribute("Description", mdm.strDescription);
+        pelmMedium->setAttribute("Description", mdm.strDescription);
 
     for (StringsMap::const_iterator it = mdm.properties.begin();
@@ -996 +1014 @@
          ++it)
     {
-        xml::ElementNode *pelmProp = pelmHardDisk->createChild("Property");
+        xml::ElementNode *pelmProp = pelmMedium->createChild("Property");
         pelmProp->setAttribute("name", it->first);
         pelmProp->setAttribute("value", it->second);
@@ -1008 +1026 @@
             mdm.hdType == MediumType_Immutable ? "Immutable" :
             mdm.hdType == MediumType_Writethrough ? "Writethrough" :
-            mdm.hdType == MediumType_Shareable ? "Shareable" : "INVALID";
-        pelmHardDisk->setAttribute("type", pcszType);
+            mdm.hdType == MediumType_Shareable ? "Shareable" :
+            mdm.hdType == MediumType_Readonly ? "Readonly" : "INVALID";
+        pelmMedium->setAttribute("type", pcszType);
     }
 
@@ -1017 +1036 @@
     {
         // recurse for children
-        buildHardDisk(*pelmHardDisk, // parent
-                      *it,           // settings::Medium
-                      ++level);      // recursion level
+        buildMedium(*pelmMedium, // parent
+                    devType,     // device type
+                    *it,         // settings::Medium
+                    ++level);    // recursion level
     }
 }
@@ -1044 +1064 @@
          ++it)
     {
-        buildHardDisk(*pelmHardDisks, *it, 0);
+        buildMedium(*pelmHardDisks, DeviceType_HardDisk, *it, 0);
     }
 
@@ -1052 +1072 @@
          ++it)
     {
-        const Medium &mdm = *it;
-        xml::ElementNode *pelmMedium = pelmDVDImages->createChild("Image");
-        pelmMedium->setAttribute("uuid", mdm.uuid.toStringCurly());
-        pelmMedium->setAttribute("location", mdm.strLocation);
-        if (mdm.strDescription.length())
-            pelmMedium->setAttribute("Description", mdm.strDescription);
+        buildMedium(*pelmDVDImages, DeviceType_DVD, *it, 0);
     }
 
@@ -1065 +1080 @@
          ++it)
     {
-        const Medium &mdm = *it;
-        xml::ElementNode *pelmMedium = pelmFloppyImages->createChild("Image");
-        pelmMedium->setAttribute("uuid", mdm.uuid.toStringCurly());
-        pelmMedium->setAttribute("location", mdm.strLocation);
-        if (mdm.strDescription.length())
-            pelmMedium->setAttribute("Description", mdm.strDescription);
+        buildMedium(*pelmFloppyImages, DeviceType_Floppy, *it, 0);
     }
 }