Changeset 22503 in vbox for trunk/src

Timestamp:

Aug 27, 2009 10:13:42 AM (16 years ago)

Author:

vboxsync

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

51523

Message:

VBoxService: Added command execution thread (only used for sysprep spawning used by the VDI guys yet).

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/Makefile.kmk (modified) (2 diffs)
• Additions/common/VBoxService/VBoxService.cpp (modified) (2 diffs)
• Additions/common/VBoxService/VBoxServiceInternal.h (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -39 +39 @@
 ifdef VBOX_WITH_GUEST_PROPS
  VBoxService_DEFS        += VBOX_WITH_GUEST_PROPS VBOXSERVICE_VMINFO
+ if1of ($(KBUILD_TARGET), win)
+  VBoxService_DEFS       += VBOX_WITH_HGCM VBOXSERVICE_VMEXEC
+ endif
 endif
 VBoxService_SOURCES       = \
@@ -46 +49 @@
 ifdef VBOX_WITH_GUEST_PROPS
  VBoxService_SOURCES.win  = \
-        VBoxServiceVMInfo-win.cpp
+        VBoxServiceVMInfo-win.cpp \
+        VBoxServiceExec.cpp
  VBoxService_SOURCES     += \
         VBoxServiceVMInfo.cpp

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -85 +85 @@
     { &g_VMInfo, NIL_RTTHREAD, false, false, false, true },
 #endif
+#ifdef VBOXSERVICE_VMEXEC
+    { &g_VMExec, NIL_RTTHREAD, false, false, false, true },
+#endif
 };
 
@@ -321 +324 @@
         VBoxServiceVerbose(1, "Starting '%s' in the main thread\n", g_aServices[iMain].pDesc->pszName);
         rc = g_aServices[iMain].pDesc->pfnWorker(&g_fShutdown);
-        VBoxServiceError("Service '%s' stopped unexpected; rc=%Rrc\n", g_aServices[iMain].pDesc->pszName, rc);
+        if (rc != VINF_SUCCESS) /* Only complain if service returned an error. Otherwise the service is a one-timer. */
+        {
+            VBoxServiceError("Service '%s' stopped unexpected; rc=%Rrc\n", g_aServices[iMain].pDesc->pszName, rc);
+        }
     }
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -136 +136 @@
 extern VBOXSERVICE g_Control;
 extern VBOXSERVICE g_VMInfo;
+extern VBOXSERVICE g_VMExec;
 
 #ifdef RT_OS_WINDOWS

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1888 +1888 @@
             parms[1].u.pointer.addr = (void *)VBoxSVNRevString();
             parms[1].u.pointer.size = strlen(VBoxSVNRevString()) + 1;
+            parms[2].type = VBOX_HGCM_SVC_PARM_PTR;
+            parms[2].u.pointer.addr = (void *)"TRANSIENT, RDONLYGUEST";
+            parms[2].u.pointer.size = sizeof("TRANSIENT, RDONLYGUEST");
+            pConsole->mVMMDev->hgcmHostCall ("VBoxGuestPropSvc", guestProp::SET_PROP_HOST, 3, &parms[0]);
+
+            /* Initialize the remote execution properties for ready-on access by the guest */
+            Utf8Str utf8ValEmpty = "";
+            parms[0].type = VBOX_HGCM_SVC_PARM_PTR;
+            parms[0].u.pointer.addr = (void *)"/VirtualBox/HostGuest/SysprepArgs";
+            parms[0].u.pointer.size = sizeof("/VirtualBox/HostGuest/SysprepArgs");
+            parms[1].type = VBOX_HGCM_SVC_PARM_PTR;
+            parms[1].u.pointer.addr = (void*)utf8ValEmpty.c_str();
+            parms[1].u.pointer.size = (uint32_t)utf8ValEmpty.length() + 1;
             parms[2].type = VBOX_HGCM_SVC_PARM_PTR;
             parms[2].u.pointer.addr = (void *)"TRANSIENT, RDONLYGUEST";