Changeset 35040 in vbox for trunk

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

Files:

• MachineImpl.cpp (modified) (1 diff)
• MediumImpl.cpp (modified) (5 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• xml/Settings.cpp (modified) (3 diffs)
• xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7546 +7546 @@
                 }
 
+                if (medium->getType() == MediumType_MultiAttach)
+                {
+                    if (isSnapshotMachine())
+                        return setError(E_FAIL,
+                                        tr("Multi-attach hard disk '%s' with UUID {%RTuuid} cannot be directly attached to snapshot with UUID {%RTuuid} "
+                                           "of the virtual machine '%s' ('%s')"),
+                                        medium->getLocationFull().c_str(),
+                                        dev.uuid.raw(),
+                                        puuidSnapshot->raw(),
+                                        mUserData->s.strName.c_str(),
+                                        mData->m_strConfigFileFull.c_str());
+
+                    return setError(E_FAIL,
+                                    tr("Multi-attach hard disk '%s' with UUID {%RTuuid} cannot be directly attached to the virtual machine '%s' ('%s')"),
+                                    medium->getLocationFull().c_str(),
+                                    dev.uuid.raw(),
+                                    mUserData->s.strName.c_str(),
+                                    mData->m_strConfigFileFull.c_str());
+                }
+
                 if (    !isSnapshotMachine()
                      && medium->getChildren().size() != 0

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1646 +1646 @@
 
     /* Cannot change the type of a medium being in use by more than one VM.
-     * If the change is to Immutable then it must not be attached to any VM,
-     * otherwise assumptions elsewhere are violated and the VM becomes
-     * inaccessible. Attaching an immutable medium triggers the diff creation,
-     * and this is vital for the correct operation. */
+     * If the change is to Immutable or MultiAttach then it must not be
+     * directly attached to any VM, otherwise the assumptions about indirect
+     * attachment elsewhere are violated and the VM becomes inaccessible.
+     * Attaching an immutable medium triggers the diff creation, and this is
+     * vital for the correct operation. */
     if (   m->backRefs.size() > 1
-        || (aType == MediumType_Immutable && m->backRefs.size() > 0))
+        || (   (   aType == MediumType_Immutable
+                || aType == MediumType_MultiAttach)
+            && m->backRefs.size() > 0))
         return setError(VBOX_E_INVALID_OBJECT_STATE,
                         tr("Cannot change the type of medium '%s' because it is attached to %d virtual machines"),
@@ -1660 +1663 @@
         case MediumType_Normal:
         case MediumType_Immutable:
+        case MediumType_MultiAttach:
         {
             /* normal can be easily converted to immutable and vice versa even
@@ -3423 +3427 @@
         }
         case MediumType_Immutable:
+        case MediumType_MultiAttach:
             return true;
         case MediumType_Writethrough:
@@ -4237 +4242 @@
                                tr("Medium '%s' is immutable"),
                                m->strLocationFull.c_str());
+            if (m->type == MediumType_MultiAttach)
+                throw setError(VBOX_E_INVALID_OBJECT_STATE,
+                               tr("Medium '%s' is multi-attach"),
+                               m->strLocationFull.c_str());
         }
         else
@@ -4251 +4260 @@
                 throw setError(VBOX_E_INVALID_OBJECT_STATE,
                                tr("Medium '%s' is immutable"),
+                               pTarget->m->strLocationFull.c_str());
+            if (pTarget->m->type == MediumType_MultiAttach)
+                throw setError(VBOX_E_INVALID_OBJECT_STATE,
+                               tr("Medium '%s' is multi-attach"),
                                pTarget->m->strLocationFull.c_str());
         }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -8793 +8793 @@
   <enum
     name="MediumType"
-    uuid="19388a99-8e70-4bd4-9a95-90cbc513ef6d"
+    uuid="fe663fb5-c244-4e1b-9d81-c628b417dd04"
     >
     <desc>
@@ -8827 +8827 @@
       <desc>
         A readonly medium, which can of course be used by several machines.
+        <note>Present and accepted since VirtualBox 4.0.</note>
+      </desc>
+    </const>
+    <const name="MultiAttach"       value="5">
+      <desc>
+        A medium which is is indirectly attached, so that one base medium can
+        be used for several VMs which have their own differencing medium to
+        store their modifications. In some sense a variant of Immutable
+        with unset AutoReset flag in each differencing medium.
         <note>Present and accepted since VirtualBox 4.0.</note>
       </desc>

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>