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

Timestamp:

Nov 25, 2009 4:56:40 PM (15 years ago)

Author:

vboxsync

Message:

Main,VBoxManage: Check for timeout in the progress object (simple polling) and made use of this in the controlvm teleport VBoxManage command.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (modified) (4 diffs)

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

@@ -797 +797 @@
             uint32_t    uMaxDowntime = 250 /*ms*/;
             uint32_t    uPort        = UINT32_MAX;
+            uint32_t    cMsTimeout   = 0;
             Bstr        bstrPassword("");
             static const RTGETOPTDEF s_aTeleportOptions[] =
@@ -804 +805 @@
                 { "--maxdowntime", 'd', RTGETOPT_REQ_UINT32 },
                 { "--port",        'p', RTGETOPT_REQ_UINT32 }, /** @todo RTGETOPT_FLAG_MANDATORY */
-                { "--password",    'P', RTGETOPT_REQ_STRING }
+                { "--password",    'P', RTGETOPT_REQ_STRING },
+                { "--timeout",     't', RTGETOPT_REQ_UINT32 }
             };
             RTGETOPTSTATE GetOptState;
@@ -819 +821 @@
                     case 'p': uPort         = Value.u32; break;
                     case 'P': bstrPassword  = Value.psz; break;
+                    case 't': cMsTimeout    = Value.u32; break;
                     default:
                         errorGetOpt(USAGE_CONTROLVM, ch, &Value);
@@ -830 +833 @@
             ComPtr<IProgress> progress;
             CHECK_ERROR_BREAK(console, Teleport(bstrHostname, uPort, bstrPassword, uMaxDowntime, progress.asOutParam()));
+
+            if (cMsTimeout)
+            {
+                rc = progress->COMSETTER(Timeout)(cMsTimeout);
+                if (FAILED(rc) && rc != VBOX_E_INVALID_OBJECT_STATE)
+                    CHECK_ERROR_BREAK(progress, COMSETTER(Timeout)(cMsTimeout)); /* lazyness */
+            }
+
             rc = showProgress(progress);
             if (FAILED(rc))