Changeset 42178 in vbox for trunk/src/VBox

Timestamp:

Jul 17, 2012 12:35:07 PM (13 years ago)

Author:

vboxsync

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

79176

Message:

Autostart: Make the path to the autostart database configurable

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/AutostartDb.h (modified) (5 diffs)
• Main/include/SystemPropertiesImpl.h (modified) (2 diffs)
• Main/src-server/MachineImpl.cpp (modified) (2 diffs)
• Main/src-server/SystemPropertiesImpl.cpp (modified) (4 diffs)
• Main/src-server/VirtualBoxImpl.cpp (modified) (2 diffs)

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

@@ -591 +591 @@
                      "                            websrvauthlibrary default|null|<library> |\n"
                      "                            vrdeextpack null|<library> |\n"
+                     "                            autostartdbpath null|<folder> |\n"
                      "                            loghistorycount <value>\n"
                      "\n");

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

@@ -857 +857 @@
         CHECK_ERROR(systemProperties, COMSETTER(LogHistoryCount)(uVal));
     }
+    else if (!strcmp(a->argv[0], "autostartdbpath"))
+    {
+        /* disable? */
+        if (!strcmp(a->argv[1], "null"))
+            CHECK_ERROR(systemProperties, COMSETTER(AutostartDatabasePath)(NULL));
+        else
+            CHECK_ERROR(systemProperties, COMSETTER(AutostartDatabasePath)(Bstr(a->argv[1]).raw()));
+    }
     else
         return errorSyntax(USAGE_SETPROPERTY, "Invalid parameter '%s'", a->argv[0]);

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -7981 +7981 @@
     name="ISystemProperties"
     extends="$unknown"
-    uuid="8a0ab9ab-48c1-4d04-954b-4a751413d084"
+    uuid="20fc263c-e1e9-4e86-b9b0-835950790d13"
     wsmap="managed"
     >
@@ -8231 +8231 @@
     </attribute>
 
+    <attribute name="autostartDatabasePath" type="wstring">
+      <desc>
+        The path to the autostart database. Depending on the host this might
+        be a filesystem path or something else.
+      </desc>
+    </attribute>
 
     <method name="getMaxNetworkAdapters">

trunk/src/VBox/Main/include/AutostartDb.h

@@ -30 +30 @@
 
         /**
+         * Sets the path to the autostart database.
+         *
+         * @returns VBox status code.
+         * @param   pszAutostartDbPathNew    Path to the autostart database.
+         */
+        int setAutostartDbPath(const char *pszAutostartDbPathNew);
+
+        /**
          * Add a autostart VM to the global database.
          *
          * @returns VBox status code.
+         * @retval VERR_PATH_NOT_FOUND if the autostart database directory is not set.
          * @param   pszVMId    ID of the VM to add.
          */
@@ -41 +50 @@
          *
          * @returns VBox status code.
+         * @retval VERR_PATH_NOT_FOUND if the autostart database directory is not set.
          * @param   pszVMId    ID of the VM to remove.
          */
@@ -49 +59 @@
          *
          * @returns VBox status code.
+         * @retval VERR_PATH_NOT_FOUND if the autostart database directory is not set.
          * @param   pszVMId    ID of the VM to add.
          */
@@ -57 +68 @@
          *
          * @returns VBox status code.
+         * @retval VERR_PATH_NOT_FOUND if the autostart database directory is not set.
          * @param   pszVMId    ID of the VM to remove.
          */
@@ -66 +78 @@
         /** Critical section protecting the database against concurrent access. */
         RTCRITSECT      CritSect;
+        /** Path to the autostart database. */
+        char           *m_pszAutostartDbPath;
+
+        /**
+         * Autostart database modification worker.
+         *
+         * @returns VBox status code.
+         * @param   fAutostart    Flag whether the autostart or autostop database is modified.
+         * @param   fAddVM        Flag whether a VM is added or removed from the database.
+         */
+        int autostartModifyDb(bool fAutostart, bool fAddVM);
 #endif
 };

trunk/src/VBox/Main/include/SystemPropertiesImpl.h

@@ -92 +92 @@
     STDMETHOD(COMSETTER(LogHistoryCount))(ULONG count);
     STDMETHOD(COMGETTER(DefaultAudioDriver))(AudioDriverType_T *aAudioDriver);
+    STDMETHOD(COMGETTER(AutostartDatabasePath))(BSTR *aAutostartDbPath);
+    STDMETHOD(COMSETTER(AutostartDatabasePath))(IN_BSTR aAutostartDbPath);
 
     STDMETHOD(GetMaxNetworkAdapters)(ChipsetType_T aChipset, ULONG *aMaxInstances);
@@ -124 +126 @@
     HRESULT setWebServiceAuthLibrary(const Utf8Str &aPath);
     HRESULT setDefaultVRDEExtPack(const Utf8Str &aPath);
+    HRESULT setAutostartDatabasePath(const Utf8Str &aPath);
 
     VirtualBox * const  mParent;

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -6640 +6640 @@
                 hrc = setError(VBOX_E_NOT_SUPPORTED,
                                tr("The VM autostart feature is not supported on this platform"));
+            else if (vrc == VERR_PATH_NOT_FOUND)
+                hrc = setError(E_FAIL,
+                               tr("The path to the autostart database is not set"));
             else
                 hrc = setError(E_UNEXPECTED,
@@ -6728 +6731 @@
                 hrc = setError(VBOX_E_NOT_SUPPORTED,
                                tr("The VM autostop feature is not supported on this platform"));
+            else if (vrc == VERR_PATH_NOT_FOUND)
+                hrc = setError(E_FAIL,
+                               tr("The path to the autostart database is not set"));
             else
                 hrc = setError(E_UNEXPECTED,

trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp

@@ -26 +26 @@
 #include "Global.h"
 #include "Logging.h"
+#include "AutostartDb.h"
 
 // generated header
@@ -918 +919 @@
 }
 
+STDMETHODIMP SystemProperties::COMGETTER(AutostartDatabasePath)(BSTR *aAutostartDbPath)
+{
+    CheckComArgOutPointerValid(aAutostartDbPath);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    m->strAutostartDatabasePath.cloneTo(aAutostartDbPath);
+
+    return S_OK;
+}
+
+STDMETHODIMP SystemProperties::COMSETTER(AutostartDatabasePath)(IN_BSTR aAutostartDbPath)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    HRESULT rc = setAutostartDatabasePath(aAutostartDbPath);
+    alock.release();
+
+    if (SUCCEEDED(rc))
+    {
+        // VirtualBox::saveSettings() needs vbox write lock
+        AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
+        rc = mParent->saveSettings();
+    }
+
+    return rc;
+}
+
 // public methods only for internal purposes
 /////////////////////////////////////////////////////////////////////////////
@@ -946 +980 @@
 
     m->ulLogHistoryCount = data.ulLogHistoryCount;
+
+    rc = setAutostartDatabasePath(data.strAutostartDatabasePath);
+    if (FAILED(rc)) return rc;
 
     return S_OK;
@@ -1124 +1161 @@
     return S_OK;
 }
+
+HRESULT SystemProperties::setAutostartDatabasePath(const Utf8Str &aPath)
+{
+    HRESULT rc = S_OK;
+    AutostartDb *autostartDb = this->mParent->getAutostartDb();
+
+    if (!aPath.isEmpty())
+    {
+        /* Update path in the autostart database. */
+        int vrc = autostartDb->setAutostartDbPath(aPath.c_str());
+        if (RT_SUCCESS(vrc))
+            m->strAutostartDatabasePath = aPath;
+        else
+            rc = setError(E_FAIL,
+                          tr("Cannot set the autostart database path (%Rrc)"),
+                          vrc);
+    }
+    else
+    {
+        int vrc = autostartDb->setAutostartDbPath(NULL);
+        AssertRC(vrc);
+        m->strAutostartDatabasePath = "";
+    }
+
+    return rc;
+}

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -423 +423 @@
         if (FAILED(rc)) throw rc;
 
+        /*
+         * Create autostart database object early, because the system properties
+         * might need it.
+         */
+        unconst(m->pAutostartDb) = new AutostartDb;
+
         /* create the system properties object, someone may need it too */
         unconst(m->pSystemProperties).createObject();
@@ -489 +495 @@
             throw rc;
 #endif
-
-        unconst(m->pAutostartDb) = new AutostartDb;
     }
     catch (HRESULT err)