Changeset 20313 in vbox

Timestamp:

Jun 5, 2009 11:00:32 AM (16 years ago)

Author:

vboxsync

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

48212

Message:

Frontends/VBoxManage, Main/Machine: implement new session type "headless" which suppresses any output. Based on the contribution by Josh Wright.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• Main/MachineImpl.cpp (modified) (2 diffs)

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

@@ -462 +462 @@
                 }
 #endif
+#ifdef VBOX_WITH_HEADLESS
                 else if (!RTStrICmp(ValueUnion.psz, "capture"))
                 {
                     sessionType = "capture";
                 }
+                else if (!RTStrICmp(ValueUnion.psz, "headless"))
+                {
+                    sessionType = "headless";
+                }
+#endif
                 else
                     return errorArgument("Invalid session type '%s'", ValueUnion.psz);

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

@@ -259 +259 @@
     {
         RTPrintf("VBoxManage startvm          <uuid>|<name>\n");
+        RTPrintf("                            [--type gui");
         if (fVRDP)
-            RTPrintf("                            [--type gui|vrdp]\n");
+            RTPrintf(                         "|vrdp");
+        RTPrintf(                             "|headless]\n");
         RTPrintf("\n");
     }

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3871 +3871 @@
     else
 
+#ifdef VBOX_WITH_HEADLESS
+    if (   type == "headless"
+        || type == "capture"
 #ifdef VBOX_WITH_VRDP
-    if (type == "vrdp")
+        || type == "vrdp"
+#endif
+       )
     {
         const char VBoxVRDP_exe[] = "VBoxHeadless" HOSTSUFF_EXE;
@@ -3879 +3884 @@
 
         Utf8Str idStr = mData->mUuid.toString();
+        /* Leave space for 2 args, as "headless" needs --vrdp off on non-OSE. */
 # ifdef RT_OS_WINDOWS
-        const char * args[] = {path, "--startvm", idStr, 0 };
+        const char * args[] = {path, "--startvm", idStr, 0, 0, 0 };
 # else
         Utf8Str name = mUserData->mName;
-        const char * args[] = {path, "--comment", name, "--startvm", idStr, 0 };
+        const char * args[] = {path, "--comment", name, "--startvm", idStr, 0, 0, 0 };
 # endif
-        vrc = RTProcCreate (path, args, env, 0, &pid);
-    }
-#else /* !VBOX_WITH_VRDP */
-    if (0)
-        ;
-#endif /* !VBOX_WITH_VRDP */
-
-    else
-
-#ifdef VBOX_WITH_HEADLESS
-    if (type == "capture")
-    {
-        const char VBoxVRDP_exe[] = "VBoxHeadless" HOSTSUFF_EXE;
-        Assert (sz >= sizeof (VBoxVRDP_exe));
-        strcpy (cmd, VBoxVRDP_exe);
-
-        Utf8Str idStr = mData->mUuid.toString();
-# ifdef RT_OS_WINDOWS
-        const char * args[] = {path, "--startvm", idStr, "--capture", 0 };
-# else
-        Utf8Str name = mUserData->mName;
-        const char * args[] = {path, "--comment", name, "--startvm", idStr, "--capture", 0 };
-# endif
+#ifdef VBOX_WITH_VRDP
+        if (type == "headless")
+        {
+            unsigned pos = RT_ELEMENTS(args) - 3;
+            args[pos++] = "--vrdp";
+            args[pos] = "off";
+        }
+#endif
+        if (type == "capture")
+        {
+            unsigned pos = RT_ELEMENTS(args) - 3;
+            args[pos] = "--capture";
+        }
         vrc = RTProcCreate (path, args, env, 0, &pid);
     }