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

Timestamp:

Dec 13, 2010 5:44:28 PM (14 years ago)

Author:

vboxsync

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

68870

Message:

Main/Medium+Machine+Settings: new medium type MultiAttach, meant for having many VMs pointing at the same base medium and each having its own diff for changes

Location:

trunk/src/VBox/Main/xml

Files:

• Settings.cpp (modified) (3 diffs)
• VirtualBox-settings-common.xsd (modified) (1 diff)

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

@@ -678 +678 @@
             else if (strType == "READONLY")
                 med.hdType = MediumType_Readonly;
+            else if (strType == "MULTIATTACH")
+                med.hdType = MediumType_MultiAttach;
             else
-                throw ConfigFileError(this, &elmMedium, N_("HardDisk/@type attribute must be one of Normal, Immutable or Writethrough"));
+                throw ConfigFileError(this, &elmMedium, N_("HardDisk/@type attribute must be one of Normal, Immutable, Writethrough, Shareable, Readonly or MultiAttach"));
         }
     }
@@ -1037 +1039 @@
             mdm.hdType == MediumType_Writethrough ? "Writethrough" :
             mdm.hdType == MediumType_Shareable ? "Shareable" :
-            mdm.hdType == MediumType_Readonly ? "Readonly" : "INVALID";
+            mdm.hdType == MediumType_Readonly ? "Readonly" :
+            mdm.hdType == MediumType_MultiAttach ? "MultiAttach" :
+            "INVALID";
         pelmMedium->setAttribute("type", pcszType);
     }
@@ -4482 +4486 @@
     }
 
+    // Settings version 1.11 is required if Readonly/MultiAttach media
+    // are present.
+    if (m->sv < SettingsVersion_v1_11)
+    {
+        /// @todo add code going over all medium attachments and check if
+        // they are of type Readonly or MultiAttach.
+    }
+
     // settings version 1.9 is required if there is not exactly one DVD
     // or more than one floppy drive present or the DVD is not at the secondary

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -308 +308 @@
             <xsd:enumeration value="Immutable"/>
             <xsd:enumeration value="Writethrough"/>
+            <xsd:enumeration value="Shareable"/>
+            <xsd:enumeration value="Readonly"/>
+            <xsd:enumeration value="MultiAttach"/>
           </xsd:restriction>
         </xsd:simpleType>