Changeset 39477 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 30, 2011 4:02:17 PM (13 years ago)

Author:

vboxsync

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

75132

Message:

VMM,VBoxManage,Main: Automatic map file loading for simplifying debugging.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -663 +663 @@
     PUVM pUVM = pConsole->mpUVM = VMR3GetUVM(pVM);
     VMR3RetainUVM(pUVM);
-    int vrc = pConsole->configConstructorInner(pVM, &alock);
+    int vrc;
+    try
+    {
+        vrc = pConsole->configConstructorInner(pVM, &alock);
+    }
+    catch (...)
+    {
+        vrc = VERR_UNEXPECTED_EXCEPTION;
+    }
     if (RT_FAILURE(vrc))
     {
@@ -1117 +1125 @@
 #endif
         }
-        /*
-         * Enable 3 following devices: HPET, SMC, LPC on MacOS X guests or on ICH9 chipset
-         */
+
+        /*
+         * Enable the following devices: HPET, SMC and LPC on MacOS X guests or on ICH9 chipset
+         */
+
         /*
          * High Precision Event Timer (HPET)
@@ -2631 +2641 @@
                 }
             }
+        }
+
+        /*
+         * Set up the default DBGF search paths if all is cool so far.
+         */
+        {
+            PCFGMNODE pDbgf;
+            InsertConfigNode(pRoot, "DBGF", &pDbgf);
+
+            hrc = pMachine->COMGETTER(SettingsFilePath)(bstr.asOutParam());         H();
+            Utf8Str strSettingsPath(bstr);
+            bstr.setNull();
+            strSettingsPath.stripFilename();
+
+            char szHomeDir[RTPATH_MAX];
+            rc = RTPathUserHome(szHomeDir, sizeof(szHomeDir));
+            if (RT_FAILURE(rc))
+                szHomeDir[0] = '\0';
+
+            Utf8Str strPath;
+            strPath.append(strSettingsPath).append("/debug/;");
+            strPath.append(strSettingsPath).append("/;");
+            strPath.append(szHomeDir).append("/");
+
+            InsertConfigString(pDbgf, "Path", strPath.c_str());
         }
     }