Changeset 37900 in vbox

Timestamp:

Jul 12, 2011 1:31:46 PM (13 years ago)

Author:

vboxsync

Message:

Main-CloneVM;FE/CLI;Doc: update differencing disk names with there new uuid; rename all other disks to the new name + disk#; optional allow keeping old disk names

Location:

trunk

Files:

• doc/manual/en_US/user_VBoxManage.xml (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/MediumImpl.h (modified) (1 diff)
• src/VBox/Main/src-server/MachineImplCloneVM.cpp (modified) (5 diffs)
• src/VBox/Main/src-server/MediumImpl.cpp (modified) (1 diff)

trunk/doc/manual/en_US/user_VBoxManage.xml

@@ -1118 +1118 @@
        </listitem>
        <listitem>
-           <para><computeroutput>--options keepallmacs|keepnatmacs</computeroutput>: 
-           With this option you define how the MAC addresses of every virtual
+           <para><computeroutput>--options keepallmacs|keepnatmacs|keepdisknames</computeroutput>: 
+           Allows additional fine tuning of the clone operation. The first two
+           options allow to define how the MAC addresses of every virtual
            network card should be handled. They can either be reinitialized
            (the default), leaved unchanged
            (<computeroutput>keepallmacs</computeroutput>) or leaved unchanged
-           when the network type is NAT (<computeroutput>keepnatmacs</computeroutput>).
-           </para>
+           when the network type is NAT
+           (<computeroutput>keepnatmacs</computeroutput>). If you add
+           <computeroutput>keepdisknames</computeroutput> all new disk images
+           are called like the original once, otherwise they are
+           renamed.</para>
        </listitem>
        <listitem>

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -336 +336 @@
                      "                            [--snapshot <uuid>|<name>]\n"
                      "                            [--mode machine|machineandchilds|all]\n"
-                     "                            [--options keepallmacs|keepnatmacs]\n"
+                     "                            [--options keepallmacs|keepnatmacs|keepdisknames]\n"
                      "                            [--name <name>]\n"
                      "                            [--basefolder <basefolder>]\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -309 +309 @@
             else if (!RTStrNICmp(psz, "KeepNATMACs", len))
                 options->push_back(CloneOptions_KeepNATMACs);
+            else if (!RTStrNICmp(psz, "KeepDiskNames", len))
+                options->push_back(CloneOptions_KeepDiskNames);
 //            else if (!RTStrNICmp(psz, "Link", len))
-//                *options.push_back(CloneOptions_Link)
+//                options->push_back(CloneOptions_Link)
             else
                 rc = VERR_PARSE_ERROR;

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

@@ -3600 +3600 @@
   <enum
     name="CloneOptions" extends="$unknown"
-    uuid="1be61ee1-c0ea-4942-b733-7496f27d4f28"
+    uuid="22243f8e-96ab-497c-8cf0-f40a566c630b"
     >
 
@@ -3615 +3615 @@
     <const name="KeepNATMACs"        value="3">
       <desc>Don't generate new MAC addresses of the attached network adapters when they are using NAT.</desc>
+    </const>
+    <const name="KeepDiskNames"      value="4">
+      <desc>Don't change the disk names.</desc>
     </const>
 

trunk/src/VBox/Main/include/MediumImpl.h

@@ -205 +205 @@
 
     bool isReadOnly();
+    void updateId(const Guid &id);
 
     HRESULT saveSettings(settings::Medium &data,

trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp

@@ -464 +464 @@
     /*
      * Todo:
-     * - Snapshot diffs (can) have the uuid as name. After cloning this isn't
-     *   right anymore. Is it worth to change to the new uuid? Or should the
-     *   cloned disks called exactly as the original one or should all new disks
-     *   get a new name with the new VM name in it.
      * - What about log files?
      */
@@ -541 +537 @@
         strTrgSnapshotFolder = Utf8StrFmt("%s%c%s", strTrgMachineFolder.c_str(), RTPATH_DELIMITER, trgMCF.machineUserData.strSnapshotFolder.c_str());
 
+        /* Should we rename the disk names. */
+        bool fKeepDiskNames = d->options.contains(CloneOptions_KeepDiskNames);
+
         /* We need to create a map with the already created medias. This is
          * necessary, cause different snapshots could have the same
@@ -548 +547 @@
         typedef std::pair<Utf8Str, ComObjPtr<Medium> > TStrMediumPair;
         TStrMediumMap map;
+        size_t cDisks = 0;
         for (size_t i = 0; i < d->llMedias.size(); ++i)
         {
@@ -596 +596 @@
                     }
 
+                    /* If the old disk name was in {uuid} format we also want
+                     * the new name in this format, but with the updated id of
+                     * course. For all other disks we rename them with this
+                     * template: "new name-disk1.vdi". */
+                    Guid newId;
+                    newId.create();
+                    Utf8Str strNewName(bstrSrcName);
+                    if (!fKeepDiskNames)
+                    {
+                        strNewName = Utf8StrFmt("%s-disk%d%s", trgMCF.machineUserData.strName.c_str(), ++cDisks, RTPathExt(Utf8Str(bstrSrcName).c_str()));
+                        Utf8Str strSrcTest = Utf8Str(bstrSrcName).stripExt();
+                        if (strSrcTest.startsWith("{") &&
+                            strSrcTest.endsWith("}"))
+                        {
+                            strSrcTest = strSrcTest.substr(1, strSrcTest.length() - 2);
+                            if (isValidGuid(strSrcTest))
+                            {
+                                strNewName = Utf8StrFmt("%s%s", newId.toStringCurly().c_str(), RTPathExt(strNewName.c_str()));
+                                --cDisks;
+                            }
+                        }
+                    }
+
                     /* Check if this medium comes from the snapshot folder, if
                      * so, put it there in the cloned machine as well.
                      * Otherwise it goes to the machine folder. */
-                    Utf8Str strFile = Utf8StrFmt("%s%c%lS", strTrgMachineFolder.c_str(), RTPATH_DELIMITER, bstrSrcName.raw());
                     Bstr bstrSrcPath;
+                    Utf8Str strFile = Utf8StrFmt("%s%c%s", strTrgMachineFolder.c_str(), RTPATH_DELIMITER, strNewName.c_str());
                     rc = pMedium->COMGETTER(Location)(bstrSrcPath.asOutParam());
                     if (FAILED(rc)) throw rc;
                     if (   !bstrSrcPath.isEmpty()
                         &&  RTPathStartsWith(Utf8Str(bstrSrcPath).c_str(), Utf8Str(bstrSrcSnapshotFolder).c_str()))
-                        strFile = Utf8StrFmt("%s%c%lS", strTrgSnapshotFolder.c_str(), RTPATH_DELIMITER, bstrSrcName.raw());
+                        strFile = Utf8StrFmt("%s%c%s", strTrgSnapshotFolder.c_str(), RTPATH_DELIMITER, strNewName.c_str());
                     else
-                        strFile = Utf8StrFmt("%s%c%lS", strTrgMachineFolder.c_str(), RTPATH_DELIMITER, bstrSrcName.raw());
+                        strFile = Utf8StrFmt("%s%c%s", strTrgMachineFolder.c_str(), RTPATH_DELIMITER, strNewName.c_str());
 
                     /* Start creating the clone. */
@@ -620 +643 @@
                                        NULL          /* llRegistriesThatNeedSaving */);
                     if (FAILED(rc)) throw rc;
+
+                    /* Update the new uuid. */
+                    pTarget->updateId(newId);
 
                     srcLock.release();

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -3640 +3640 @@
 
     AssertFailedReturn(false);
+}
+
+/**
+ * Internal method to return the medium's size. Must have caller + locking!
+ * @return
+ */
+void Medium::updateId(const Guid &id)
+{
+    unconst(m->id) = id;
 }