Changeset 32533 in vbox

Timestamp:

Sep 15, 2010 5:30:02 PM (14 years ago)

Author:

vboxsync

Message:

Devices/VMMDev: Added GuestCoreLocation and GuestCoreCount for DBGFR3CoreWrite funtionality. (Untested).

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (5 diffs)
• VMMDevState.h (modified) (1 diff)

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

@@ -27 +27 @@
 #include <VBox/log.h>
 #include <VBox/param.h>
+#include <iprt/path.h>
+#include <iprt/dir.h>
+#include <iprt/file.h>
 #include <VBox/pgm.h>
 #include <VBox/err.h>
@@ -384 +387 @@
 #endif /* TIMESYNC_BACKDOOR */
 
+
 /**
  * Port I/O Handler for the generic request interface
@@ -544 +548 @@
                 {
                     PVM pVM = PDMDevHlpGetVM(pDevIns);
-                    pRequestHeader->rc = DBGFR3CoreWrite(pVM, NULL /* pszDumpPath */);
+
+                    /*
+                     * User makes sure the directory exists.
+                     */
+                    if (!RTDirExists(pThis->szGuestCoreLocation))
+                        return VERR_FILE_NOT_FOUND;
+                    char szCorePath[RTPATH_MAX];
+                    const char *pszCoreDir = pThis->szGuestCoreLocation;
+                    RTStrPrintf(szCorePath, sizeof(szCorePath), "%s/VBox.core", pszCoreDir);
+
+                    /*
+                     * Rotate existing cores based on number of additional cores to keep around.
+                     */
+                    if (pThis->cGuestCores > 0)
+                        for (int64_t i = pThis->cGuestCores - 1; i >= 0; i--)
+                        {
+                            char szFilePathOld[RTPATH_MAX];
+                            if (i == 0)
+                                RTStrCopy(szFilePathOld, sizeof(szFilePathOld), szCorePath);
+                            else
+                                RTStrPrintf(szFilePathOld, sizeof(szFilePathOld), "%s.%d", szCorePath, i);
+
+                            char szFilePathNew[RTPATH_MAX];
+                            RTStrPrintf(szFilePathNew, sizeof(szFilePathNew), "%s.%d", szCorePath, i + 1);
+                            int vrc = RTFileMove(szFilePathOld, szFilePathNew, RTFILEMOVE_FLAGS_REPLACE);
+                            if (vrc == VERR_FILE_NOT_FOUND)
+                                RTFileDelete(szFilePathNew);
+                        }
+
+                    /*
+                     * Write the core file.
+                     */
+                    pRequestHeader->rc = DBGFR3CoreWrite(pVM, szCorePath);
                 }
                 else
@@ -2899 +2935 @@
                                   "RZEnabled|"
                                   "GuestCoreDumpEnabled|"
+                                  "GuestCoreLocation|"
+                                  "GuestCoreCount|"
                                   "TestingEnabled"
                                   ,
@@ -2937 +2975 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 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, "GuestCoreLocation", pThis->szGuestCoreLocation, sizeof(pThis->szGuestCoreLocation),
+                              szDefaultCoreLocation);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed querying \"GuestCoreDumpLocation\" as a string"));
+
+    rc = CFGMR3QueryU32Def(pCfg, "GuestCoreCount", &pThis->cGuestCores, 3);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed querying \"GuestCoreCount\" as a 32-bit unsigned integer"));
 
 #ifndef VBOX_WITHOUT_TESTING_FEATURES

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -224 +224 @@
     bool fGuestCoreDumpEnabled;
 
-    /** Alignment padding. */
-    bool afAlignment7[4];
+    /** Guest Core Dump location. */
+    char szGuestCoreLocation[RTPATH_MAX];
+
+    /** Number of additional cores to keep around.   */
+    uint32_t cGuestCores;
+
+    bool afAlignment7[1];
 
 #ifdef VBOX_WITH_HGCM