Changeset 38099 in vbox

Timestamp:

Jul 21, 2011 1:39:27 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4/CLI;Main;Docu: enable MachineAndChildren in clone VM again for ease of testing

Location:

trunk

Files:

trunk/doc/manual/en_US/user_VBoxManage.xml

-              r38085
+              r38099
        </listitem>
        <listitem>
            <para><computeroutput>--mode machine|all</computeroutput>:
+           <para><computeroutput>--mode machine|machineandchildren|all</computeroutput>:
            Selects the cloning mode of the operation. If
            <computeroutput>machine</computeroutput> is selected (the default),
+           the current state of the VM without any snapshots is cloned. If
+           <computeroutput>all</computeroutput> is the selected mode all
+           snapshots and the current state are cloned.
+           the current state of the VM without any snapshots is cloned. In the
+           <computeroutput>machineandchildren</computeroutput> mode the snapshot
+           provided by <computeroutput>--snapshot</computeroutput> and all
+           child snapshots are cloned. If <computeroutput>all</computeroutput>
+           is the selected mode all snapshots and the current state are cloned.
            </para>
        </listitem>

r38055	r38099
335	335	"VBoxManage clonevm <uuid>\|<name>\n"
336	336	" [--snapshot <uuid>\|<name>]\n"
337		" [--mode machine\|all]\n"
	337	" [--mode machine\|machineandchildren\|all]\n"
338	338	" [--options link\|keepallmacs\|keepnatmacs\|\n"
339	339	" keepdisknames]\n"

-              r38070
+              r38099
     if (!RTStrICmp(psz, "machine"))
         *pMode = CloneMode_MachineState;
 //    else if (!RTStrICmp(psz, "machineandchildren"))
 //        *pMode = CloneMode_MachineAndChildStates;
+    else if (!RTStrICmp(psz, "machineandchildren"))
+        *pMode = CloneMode_MachineAndChildStates;
     else if (!RTStrICmp(psz, "all"))
         *pMode = CloneMode_AllStates;

-              r38055
+              r38099
      * for it. */
     if (machine.GetSnapshotCount() > 0)
+//        addPage(new UICloneVMWizardPage2(fShowChildsOption));
+        addPage(new UICloneVMWizardPage2(false));
+        addPage(new UICloneVMWizardPage2(fShowChildsOption));
     /* Translate wizard: */

-              r38056
+              r38099
     CheckComArgNotNull(pTarget);
     CheckComArgOutPointerValid(pProgress);
-    /** @todo r=klaus disabled as there are apparently still cases which are
-     * not handled correctly */
-    if (mode == CloneMode_MachineAndChildStates)
-        return setError(VBOX_E_NOT_SUPPORTED,
-                        tr("The clone mode \"Machine and child states\" is not yet supported. Please try again in the next VirtualBox maintenance update"));
     /* Convert the options. */

Note: See TracChangeset for help on using the changeset viewer.