Changeset 5391 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Oct 19, 2007 4:50:01 PM (17 years ago)

Author:

vboxsync

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

25497

Message:

VBoxManage: Added "adoptstate <vm> <state_file>" to instruct the VM to adopt the external saved state file.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (7 diffs)
• VBoxManage.h (modified) (1 diff)

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

@@ -416 +416 @@
     {
         RTPrintf("VBoxManage discardstate     <uuid>|<name>\n"
+                 "\n");
+    }
+
+    if (u64Cmd & USAGE_ADOPTSTATE)
+    {
+        RTPrintf("VBoxManage adoptstate       <uuid>|<name> <state_file>\n"
                  "\n");
     }
@@ -3587 +3593 @@
     ULONG guestStatInterval = (ULONG)-1;
 
-    /* VM ID + at least one parameter + value */
-    if (argc < 3)
-    {
+    /* VM ID + at least one parameter. Parameter arguments are checked
+     * individually. */
+    if (argc < 2)
         return errorSyntax(USAGE_MODIFYVM, "Not enough parameters");
-    }
 
     /* Get the number of network adapters */
@@ -4151 +4156 @@
         else if (strncmp(argv[i], "-guestmemoryballoon", 19) == 0)
         {
-                if (argc <= i + 1)
-                    return errorArgument("Missing argument to '%s'", argv[i-1]);
-                i++;
-                uint32_t uVal;
-                int vrc;
-                vrc = RTStrToUInt32Ex(argv[i], NULL, 0, &uVal);
-                if (vrc != VINF_SUCCESS)
-                    return errorArgument("Error parsing guest memory balloon size '%s'", argv[i]);
-                guestMemBalloonSize = uVal;
+            if (argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", argv[i]);
+            i++;
+            uint32_t uVal;
+            int vrc;
+            vrc = RTStrToUInt32Ex(argv[i], NULL, 0, &uVal);
+            if (vrc != VINF_SUCCESS)
+                return errorArgument("Error parsing guest memory balloon size '%s'", argv[i]);
+            guestMemBalloonSize = uVal;
         }
         else if (strncmp(argv[i], "-gueststatisticsinterval", 24) == 0)
         {
-                if (argc <= i + 1)
-                    return errorArgument("Missing argument to '%s'", argv[i-1]);
-                i++;
-                uint32_t uVal;
-                int vrc;
-                vrc = RTStrToUInt32Ex(argv[i], NULL, 0, &uVal);
-                if (vrc != VINF_SUCCESS)
-                    return errorArgument("Error parsing guest statistics interval '%s'", argv[i]);
-                guestStatInterval = uVal;
+            if (argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", argv[i]);
+            i++;
+            uint32_t uVal;
+            int vrc;
+            vrc = RTStrToUInt32Ex(argv[i], NULL, 0, &uVal);
+            if (vrc != VINF_SUCCESS)
+                return errorArgument("Error parsing guest statistics interval '%s'", argv[i]);
+            guestStatInterval = uVal;
         }
         else
@@ -5100 +5105 @@
         /* commit changes */
         CHECK_ERROR(machine, SaveSettings());
-    } while (0);
+    }
+    while (0);
 
     /* it's important to always close sessions */
@@ -5627 +5633 @@
             machine->COMGETTER(Id)(guid.asOutParam());
             CHECK_ERROR_BREAK(virtualBox, OpenSession(session, guid));
-            ComPtr<IConsole> console;
-            CHECK_ERROR_BREAK(session, COMGETTER(Console)(console.asOutParam()));
-            CHECK_ERROR_BREAK(console, DiscardSavedState());
+            do
+            {
+                ComPtr<IConsole> console;
+                CHECK_ERROR_BREAK(session, COMGETTER(Console)(console.asOutParam()));
+                CHECK_ERROR_BREAK(console, DiscardSavedState());
+            }
+            while (0);
             CHECK_ERROR_BREAK(session, Close());
-        } while (0);
+        }
+        while (0);
+    }
+
+    return SUCCEEDED(rc) ? 0 : 1;
+}
+
+static int handleAdoptdState(int argc, char *argv[],
+                             ComPtr<IVirtualBox> virtualBox, ComPtr<ISession> session)
+{
+    HRESULT rc;
+
+    if (argc != 2)
+    {
+        return errorSyntax(USAGE_ADOPTSTATE, "Incorrect number of parameters");
+    }
+
+    ComPtr<IMachine> machine;
+    /* assume it's a UUID */
+    rc = virtualBox->GetMachine(Guid(argv[0]), machine.asOutParam());
+    if (FAILED(rc) || !machine)
+    {
+        /* must be a name */
+        CHECK_ERROR(virtualBox, FindMachine(Bstr(argv[0]), machine.asOutParam()));
+    }
+    if (machine)
+    {
+        do
+        {
+            /* we have to open a session for this task */
+            Guid guid;
+            machine->COMGETTER(Id)(guid.asOutParam());
+            CHECK_ERROR_BREAK(virtualBox, OpenSession(session, guid));
+            do
+            {
+                ComPtr<IConsole> console;
+                CHECK_ERROR_BREAK(session, COMGETTER(Console)(console.asOutParam()));
+                CHECK_ERROR_BREAK(console, AdoptSavedState (Bstr (argv[1])));
+            }
+            while (0);
+            CHECK_ERROR_BREAK(session, Close());
+        }
+        while (0);
     }
 
@@ -7491 +7543 @@
         { "controlvm",        handleControlVM },
         { "discardstate",     handleDiscardState },
+        { "adoptstate",       handleAdoptdState },
         { "snapshot",         handleSnapshot },
         { "registerimage",    handleRegisterImage },
@@ -7522 +7575 @@
     }
 
+    /* Although all handlers should always close the session if they open it,
+     * we do it here just in case if some of the handlers contains a bug --
+     * leaving the direct session not closed will turn the machine state to
+     * Aborted which may have unwanted side effects like killing the saved
+     * state file (if the machine was in the Saved state before). */
+    session->Close();
 
     // end "all-stuff" scope

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -68 +68 @@
 #endif /* !VBOX_OSE */
 #define USAGE_VM_STATISTICS         BIT64(35)
+#define USAGE_ADOPTSTATE            BIT64(36)
 #define USAGE_ALL                   (~(uint64_t)0)
 /** @} */