Changeset 61673 in vbox

Timestamp:

Jun 13, 2016 11:50:22 AM (9 years ago)

Author:

vboxsync

Message:

FE/VBoxManage: Add dumpgueststack subcommand for debugvm

Location:

trunk

Files:

• doc/manual/en_US/man_VBoxManage-debugvm.xml (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (3 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)

trunk/doc/manual/en_US/man_VBoxManage-debugvm.xml

@@ -38 +38 @@
       <arg choice="plain">dumpvmcore</arg>
       <arg>--filename=<replaceable>name</replaceable></arg>
+    </cmdsynopsis>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-dumpgueststack">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">dumpgueststack</arg>
+      <arg>--cpu=<replaceable>id</replaceable></arg>
     </cmdsynopsis>
     <cmdsynopsis id="synopsis-vboxmanage-debugvm-info">

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

@@ -1662 +1662 @@
                     /* Refer to the correct partition and use offset 0. */
                     char *psz;
-#if defined(RT_OS_LINUX)
                     /*
                      * Check whether raw disk ends with a digit. In that case
@@ -1673 +1672 @@
                     if (RT_C_IS_DIGIT(pszRawName[cchRawDisk - 1]))
                         RTStrAPrintf(&psz,
-                                     "%sp%u",
+                                     "%s%c%u",
                                      rawdisk.c_str(),
+# if defined(RT_OS_LINUX)
+                                     'p',
+# else
+                                     's',
+# endif
                                      partitions.aPartitions[i].uIndex);
                     else
@@ -1681 +1685 @@
                                      rawdisk.c_str(),
                                      partitions.aPartitions[i].uIndex);
-#elif defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
-                    RTStrAPrintf(&psz,
-                                 "%ss%u",
-                                 rawdisk.c_str(),
-                                 partitions.aPartitions[i].uIndex);
-#endif
                     if (!psz)
                     {

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

@@ -713 +713 @@
 }
 
+/**
+ * Handles the dumpgueststack sub-command.
+ *
+ * @returns Suitable exit code.
+ * @param   pArgs               The handler arguments.
+ * @param   pDebugger           Pointer to the debugger interface.
+ */
+static RTEXITCODE handleDebugVM_DumpGuestStack(HandlerArg *pArgs, IMachineDebugger *pDebugger)
+{
+    ULONG                       idCpu = 0;
+
+    RTGETOPTSTATE               GetState;
+    RTGETOPTUNION               ValueUnion;
+    static const RTGETOPTDEF    s_aOptions[] =
+    {
+        { "--cpu", 'c', RTGETOPT_REQ_UINT32 },
+    };
+    int rc = RTGetOptInit(&GetState, pArgs->argc, pArgs->argv, s_aOptions, RT_ELEMENTS(s_aOptions), 2, RTGETOPTINIT_FLAGS_OPTS_FIRST);
+    AssertRCReturn(rc, RTEXITCODE_FAILURE);
+
+    while ((rc = RTGetOpt(&GetState, &ValueUnion)) != 0)
+    {
+        switch (rc)
+        {
+            case 'c':
+                idCpu = ValueUnion.u32;
+                break;
+
+            default:
+                return errorGetOpt(rc, &ValueUnion);
+        }
+    }
+
+    com::Bstr bstrGuestStack;
+    CHECK_ERROR2I_RET(pDebugger, DumpGuestStack(idCpu, bstrGuestStack.asOutParam()),
+                      RTEXITCODE_FAILURE);
+
+    RTPrintf("%ls\n", bstrGuestStack.raw());
+
+    return RTEXITCODE_SUCCESS;
+}
+
 RTEXITCODE handleDebugVM(HandlerArg *pArgs)
 {
@@ -809 +851 @@
                     rcExit = handleDebugVM_Statistics(pArgs, ptrDebugger);
                 }
+                else if (!strcmp(pszSubCmd, "dumpgueststack"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_DUMPGUESTSTACK);
+                    rcExit = handleDebugVM_DumpGuestStack(pArgs, ptrDebugger);
+                }
                 else
                     errorUnknownSubcommand(pszSubCmd);

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

@@ -1279 +1279 @@
                            "%s debugvm %s         <uuid|vmname>\n"
                      "                            dumpvmcore --filename <name> |\n"
+                     "                            dumpgueststack [--cpu <id>]\n"
                      "                            info <item> [args] |\n"
                      "                            injectnmi |\n"