Changeset 43909 in vbox

Timestamp:

Nov 19, 2012 10:00:02 AM (12 years ago)

Author:

vboxsync

Message:

VBoxAutostart: Continue work on the service for Windows

Location:

trunk/src/VBox/Frontends/VBoxAutostart

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxAutostart-posix.cpp (moved) (moved from trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart.cpp ) (1 diff)
• VBoxAutostartStop.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxAutostart/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# VBoxBalloonCtrl - Memory balloon control.
+# VBoxAutostart - VM autostart service.
 #
 
 #
-# Copyright (C) 2011-2012 Oracle Corporation
+# Copyright (C) 2012 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-PROGRAMS += VBoxAutostart
+ifeq ($(KBUILD_TARGET),win)
+# PROGRAMS += VBoxAutostartSvc
+# VBoxAutostart_TEMPLATE   = VBOXMAINCLIENTEXE
+# VBoxAutostart_SOURCES    = \
+#       VBoxAutostartStart.cpp \
+#       VBoxAutostartStop.cpp \
+#       VBoxAutostartUtils.cpp \
+#       VBoxAutostart-win.cpp
+else
+ PROGRAMS += VBoxAutostart
  VBoxAutostart_TEMPLATE   = VBOXMAINCLIENTEXE
  VBoxAutostart_SOURCES    = \
-        VBoxAutostart.cpp \
         VBoxAutostartCfg.cpp \
         VBoxAutostartStart.cpp \
-        VBoxAutostartStop.cpp
+        VBoxAutostartStop.cpp \
+        VBoxAutostartUtils.cpp \
+        VBoxAutostart-posix.cpp
+endif
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-posix.cpp

@@ -243 +243 @@
 }
 
-DECLHIDDEN(const char *) machineStateToName(MachineState_T machineState, bool fShort)
-{
-    switch (machineState)
-    {
-        case MachineState_PoweredOff:
-            return fShort ? "poweroff"             : "powered off";
-        case MachineState_Saved:
-            return "saved";
-        case MachineState_Aborted:
-            return "aborted";
-        case MachineState_Teleported:
-            return "teleported";
-        case MachineState_Running:
-            return "running";
-        case MachineState_Paused:
-            return "paused";
-        case MachineState_Stuck:
-            return fShort ? "gurumeditation"       : "guru meditation";
-        case MachineState_LiveSnapshotting:
-            return fShort ? "livesnapshotting"     : "live snapshotting";
-        case MachineState_Teleporting:
-            return "teleporting";
-        case MachineState_Starting:
-            return "starting";
-        case MachineState_Stopping:
-            return "stopping";
-        case MachineState_Saving:
-            return "saving";
-        case MachineState_Restoring:
-            return "restoring";
-        case MachineState_TeleportingPausedVM:
-            return fShort ? "teleportingpausedvm"  : "teleporting paused vm";
-        case MachineState_TeleportingIn:
-            return fShort ? "teleportingin"        : "teleporting (incoming)";
-        case MachineState_RestoringSnapshot:
-            return fShort ? "restoringsnapshot"    : "restoring snapshot";
-        case MachineState_DeletingSnapshot:
-            return fShort ? "deletingsnapshot"     : "deleting snapshot";
-        case MachineState_DeletingSnapshotOnline:
-            return fShort ? "deletingsnapshotlive" : "deleting snapshot live";
-        case MachineState_DeletingSnapshotPaused:
-            return fShort ? "deletingsnapshotlivepaused" : "deleting snapshot live paused";
-        case MachineState_SettingUp:
-            return fShort ? "settingup"           : "setting up";
-        default:
-            break;
-    }
-    return "unknown";
-}
-
 DECLHIDDEN(void) serviceLog(const char *pszFormat, ...)
 {

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartStop.cpp

@@ -196 +196 @@
                         case AutostopType_AcpiShutdown:
                         {
-                            /** @todo: Wait for VM to change to powered off state. */
                             BOOL fGuestEnteredACPI = false;
                             CHECK_ERROR_BREAK(console, GetGuestEnteredACPIMode(&fGuestEnteredACPI));