Changeset 9809

Timestamp:

06/19/08 10:28:07 (6 months ago)

Author:

vboxsync

Message:

Main: save and reload the guest/host registry in extra data at machine startup and shutdown

Files:

• trunk/include/VBox/HostServices/VBoxInfoSvc.h (modified) (1 diff)
• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (4 diffs)
• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (1 diff)

trunk/include/VBox/HostServices/VBoxInfoSvc.h

@@ -57 +57 @@
-/** Prefix for extra data keys used by the get and set key value functions */
-#define VBOX_SHARED_INFO_KEY_PREFIX          "Guest/"
+/** Helper macro for the length of the prefix VBOX_SHARED_INFO_KEY_PREFIX */
+#define VBOX_SHARED_INFO_PREFIX_LEN          (sizeof(VBOX_SHARED_INFO_KEY_PREFIX) - 1)
-/** Maximum length for extra data keys used by the get and set key value functions */
-enum { KEY_MAX_LEN = 64 };

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -82 +82 @@
-
-#include <VBox/HostServices/VBoxClipboardSvc.h>
+#ifdef VBOX_WITH_INFO_SVC
+# include <VBox/HostServices/VBoxInfoSvc.h>
+#endif
-
-#include <set>
@@ -4013 +4016 @@
-
-    AutoWriteLock alock (this);
+    int vrc = VINF_SUCCESS;
-
-    /* sanity */
@@ -4052 +4056 @@
-        alock.enter();
-    }
+# ifdef VBOX_WITH_INFO_SVC
+    /* Save all guest/host configuration registry entries to the machine XML
+     * file as extra data. */
+    PCFGMNODE pRegistry = CFGMR3GetChild (CFGMR3GetRoot (mpVM), "Guest/Registry/");
+    PCFGMLEAF pValue = CFGMR3GetFirstValue (pRegistry);
+    vrc = VINF_SUCCESS;
+    while (pValue != NULL && RT_SUCCESS(vrc))
+    {
+        using namespace svcInfo;
+        char szKeyName[KEY_MAX_LEN];
+        char szKeyValue[KEY_MAX_VALUE_LEN];
+        char szExtraDataName[VBOX_SHARED_INFO_PREFIX_LEN + KEY_MAX_LEN];
+        vrc = CFGMR3GetValueName (pValue, szKeyName, KEY_MAX_LEN);
+        if (RT_SUCCESS(vrc))
+            vrc = CFGMR3QueryString (pRegistry, szKeyName, szKeyValue, sizeof(szKeyValue));
+        if (RT_SUCCESS(vrc))
+        {
+            strcpy(szExtraDataName, VBOX_SHARED_INFO_KEY_PREFIX);
+            strncpy(szExtraDataName + VBOX_SHARED_INFO_PREFIX_LEN, szKeyName, sizeof(szKeyName));
+            szExtraDataName[sizeof(szExtraDataName) - 1] = 0;
+        }
+        if (RT_SUCCESS(vrc))
+            if (FAILED(mMachine->SetExtraData(Bstr(szExtraDataName).raw(), Bstr(szKeyValue).raw())))
+                vrc = VERR_UNRESOLVED_ERROR;  /* We only need to know that we have to stop. */
+        if (RT_SUCCESS(vrc))
+            pValue = CFGMR3GetNextValue (pValue);
+    }
+# endif /* VBOX_WITH_INFO_SVC defined */
-#endif /* VBOX_HGCM */
-
@@ -4086 +4118 @@
-
-    HRESULT rc = S_OK;
-int 
+
-
-    /*

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1664 +1664 @@
-            rc = CFGMR3InsertNode(pRoot,     "Guest", &pGuest);                            RC_CHECK();
-            rc = CFGMR3InsertNode(pGuest,    "Registry", &pRegistry);                      RC_CHECK();
+            /* Load the saved machine registry.  This is stored as extra data
+             * keys in the machine XML file, starting with the prefix
+             * VBOX_SHARED_INFO_KEY_PREFIX. */
+            Bstr strExtraDataKey;
+            for (;;)
+            {
+                Bstr strNextExtraDataKey;
+                Bstr strExtraDataValue;
+        
+                /* get the next key */
+                hrc = pMachine->GetNextExtraDataKey(strExtraDataKey, strNextExtraDataKey.asOutParam(),
+                                                    strExtraDataValue.asOutParam());
+        
+                /* stop if for some reason there's nothing more to request */
+                if (FAILED(hrc) || !strNextExtraDataKey)
+                    break;
+        
+                strExtraDataKey = strNextExtraDataKey;
+                Utf8Str strExtraDataKeyUtf8 = Utf8Str(strExtraDataKey);
+        
+                /* we only care about keys starting with VBOX_SHARED_INFO_KEY_PREFIX */
+                if (strncmp(strExtraDataKeyUtf8.raw(), VBOX_SHARED_INFO_KEY_PREFIX, VBOX_SHARED_INFO_PREFIX_LEN) != 0)
+                    continue;
+                char *pszCFGMValueName = (char*)strExtraDataKeyUtf8.raw() + VBOX_SHARED_INFO_PREFIX_LEN;
+        
+                /* now let's have a look at the value */
+                Utf8Str strCFGMValueUtf8 = Utf8Str(strExtraDataValue);
+                const char *pszCFGMValue = strCFGMValueUtf8.raw();
+                /* empty value means remove value which we've already done */
+                if (pszCFGMValue && *pszCFGMValue)
+                {
+                    rc = CFGMR3InsertString(pRegistry, pszCFGMValueName, pszCFGMValue);
+                    AssertMsgRC(rc, ("failed to insert CFGM value '%s' to key '%s'\n", pszCFGMValue, pszCFGMValueName));
+                }
+            }
+
-            /* Setup the service. */
-            VBOXHGCMSVCPARM parm;