Changeset 32672 in vbox

Timestamp:

Sep 21, 2010 4:42:52 PM (14 years ago)

Author:

vboxsync

Message:

VMMDev: Use snapshot dir as default guest coredump dir.

Location:

trunk/src/VBox

Files:

• Devices/VMMDev/VMMDev.cpp (modified) (2 diffs)
• Main/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -25 +25 @@
 #define LOG_GROUP LOG_GROUP_DEV_VMM
 #include <VBox/VMMDev.h>
+#include <VBox/mm.h>
 #include <VBox/log.h>
 #include <VBox/param.h>
@@ -2976 +2977 @@
                                 N_("Configuration error: Failed querying \"GuestCoreDumpEnabled\" as a boolean"));
 
-    /** @todo change this to Snapshots folder!!  */
-    char szDefaultCoreLocation[RTPATH_MAX];
-    RTPathUserHome(szDefaultCoreLocation, sizeof(szDefaultCoreLocation));
-    rc = CFGMR3QueryStringDef(pCfg, "GuestCoreDumpDir", pThis->szGuestCoreDumpDir, sizeof(pThis->szGuestCoreDumpDir),
-                              szDefaultCoreLocation);
+    char *pszGuestCoreDumpDir = NULL;
+    rc = CFGMR3QueryStringAlloc(pCfg, "GuestCoreDumpDir", &pszGuestCoreDumpDir);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed querying \"GuestCoreDumpDir\" as a string"));
+
+    RTStrCopy(pThis->szGuestCoreDumpDir, sizeof(pThis->szGuestCoreDumpDir), pszGuestCoreDumpDir);
+    MMR3HeapFree(pszGuestCoreDumpDir);
 
     rc = CFGMR3QueryU32Def(pCfg, "GuestCoreDumpCount", &pThis->cGuestCoreDumps, 3);

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1795 +1795 @@
         if (hwVersion.compare(Bstr("1")) == 0) /* <= 2.0.x */
             InsertConfigInteger(pCfg, "HeapEnabled", 0);
+        Bstr snapshotFolder;
+        hrc = pMachine->COMGETTER(SnapshotFolder)(snapshotFolder.asOutParam());            H();
+        InsertConfigString(pCfg, "GuestCoreDumpDir", snapshotFolder);
 
         /* the VMM device's Main driver */