Index: /trunk/doc/manual/en_US/man_VBoxManage-debugvm.xml
===================================================================
--- /trunk/doc/manual/en_US/man_VBoxManage-debugvm.xml (revision 61936)
+++ /trunk/doc/manual/en_US/man_VBoxManage-debugvm.xml (revision 61937)
@@ -39,10 +39,4 @@
--filename=name
-
- VBoxManage debugvm
- uuid|vmname
- dumpgueststack
- --cpu=id
-
VBoxManage debugvm
@@ -114,4 +108,10 @@
--human-readable--sh-export--sh-eval--cmd-set
settings-item
+
+
+ VBoxManage debugvm
+ uuid|vmname
+ stack
+ --cpu=id
@@ -569,4 +569,20 @@
+
+ debugvm stack
+
+
+ Unwinds the guest CPU stacks to the best of our ability. For Windows
+ guest it is recommended to first run the osdetect command.
+
+
+
+
+ Selects a single guest CPU to display the stack for. The default is all CPUs.
+
+
+
+
+
debugvm statistics
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp (revision 61936)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp (revision 61937)
@@ -28,4 +28,5 @@
#include
+#include
#include
#include
@@ -640,4 +641,75 @@
/**
+ * Handles the stack sub-command.
+ *
+ * @returns Suitable exit code.
+ * @param pArgs The handler arguments.
+ * @param pDebugger Pointer to the debugger interface.
+ */
+static RTEXITCODE handleDebugVM_Stack(HandlerArg *pArgs, IMachineDebugger *pDebugger)
+{
+ /*
+ * Parse arguments.
+ */
+ VMCPUID idCpu = VMCPUID_ALL;
+
+ 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);
+ }
+ }
+
+ /*
+ * Dump stack.
+ */
+ com::Bstr bstrGuestStack;
+ if (idCpu != VMCPUID_ALL)
+ {
+ /* Single CPU */
+ CHECK_ERROR2I_RET(pDebugger, DumpGuestStack(idCpu, bstrGuestStack.asOutParam()), RTEXITCODE_FAILURE);
+ RTPrintf("%ls\n", bstrGuestStack.raw());
+ }
+ else
+ {
+ /* All CPUs. */
+ ComPtr ptrMachine;
+ CHECK_ERROR2I_RET(pArgs->session, COMGETTER(Machine)(ptrMachine.asOutParam()), RTEXITCODE_FAILURE);
+ ULONG cCpus;
+ CHECK_ERROR2I_RET(ptrMachine, COMGETTER(CPUCount)(&cCpus), RTEXITCODE_FAILURE);
+
+ for (idCpu = 0; idCpu < (VMCPUID)cCpus; idCpu++)
+ {
+ CHECK_ERROR2I_RET(pDebugger, DumpGuestStack(idCpu, bstrGuestStack.asOutParam()), RTEXITCODE_FAILURE);
+ if (cCpus > 1)
+ {
+ if (idCpu > 0)
+ RTPrintf("\n");
+ RTPrintf("====================== CPU #%u ======================\n", idCpu);
+ }
+ RTPrintf("%ls\n", bstrGuestStack.raw());
+ }
+ }
+
+
+ return RTEXITCODE_SUCCESS;
+}
+
+/**
* Handles the statistics sub-command.
*
@@ -713,46 +785,4 @@
}
-/**
- * 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)
{
@@ -771,14 +801,14 @@
* Get the associated console and machine debugger.
*/
- HRESULT rc;
+ HRESULT hrc;
ComPtr ptrConsole;
- CHECK_ERROR(pArgs->session, COMGETTER(Console)(ptrConsole.asOutParam()));
- if (SUCCEEDED(rc))
+ CHECK_ERROR2(hrc, pArgs->session, COMGETTER(Console)(ptrConsole.asOutParam()));
+ if (SUCCEEDED(hrc))
{
if (ptrConsole.isNotNull())
{
ComPtr ptrDebugger;
- CHECK_ERROR(ptrConsole, COMGETTER(Debugger)(ptrDebugger.asOutParam()));
- if (SUCCEEDED(rc))
+ CHECK_ERROR2(hrc, ptrConsole, COMGETTER(Debugger)(ptrDebugger.asOutParam()));
+ if (SUCCEEDED(hrc))
{
/*
@@ -846,13 +876,13 @@
rcExit = handleDebugVM_Show(pArgs, ptrDebugger);
}
+ else if (!strcmp(pszSubCmd, "stack"))
+ {
+ setCurrentSubcommand(HELP_SCOPE_DEBUGVM_STACK);
+ rcExit = handleDebugVM_Stack(pArgs, ptrDebugger);
+ }
else if (!strcmp(pszSubCmd, "statistics"))
{
setCurrentSubcommand(HELP_SCOPE_DEBUGVM_STATISTICS);
rcExit = handleDebugVM_Statistics(pArgs, ptrDebugger);
- }
- else if (!strcmp(pszSubCmd, "dumpgueststack"))
- {
- setCurrentSubcommand(HELP_SCOPE_DEBUGVM_DUMPGUESTSTACK);
- rcExit = handleDebugVM_DumpGuestStack(pArgs, ptrDebugger);
}
else
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (revision 61936)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (revision 61937)
@@ -1274,28 +1274,4 @@
#endif /* VBOX_WITH_GUEST_CONTROL defined */
- if (fCategory & USAGE_DEBUGVM)
- {
- RTStrmPrintf(pStrm,
- "%s debugvm %s \n"
- " dumpvmcore --filename |\n"
- " dumpgueststack [--cpu ]\n"
- " info - [args] |\n"
- " injectnmi |\n"
- " log [--release|--debug] ...|\n"
- " logdest [--release|--debug] ...|\n"
- " logflags [--release|--debug] ...|\n"
- " osdetect |\n"
- " osinfo |\n"
- " osdmesg [--lines|-n ] |\n"
- " getregisters [--cpu ] |all ... |\n"
- " setregisters [--cpu ] = ... |\n"
- " show [--human-readable|--sh-export|--sh-eval|\n"
- " --cmd-set] \n"
- " \n"
- " [[opt] what ...] |\n"
- " statistics [--reset] [--pattern ]\n"
- " [--descriptions]\n"
- "\n", SEP);
- }
if (fCategory & USAGE_METRICS)
RTStrmPrintf(pStrm,
@@ -1406,11 +1382,11 @@
{
PCREFENTRY pHelp = g_apHelpEntries[i];
- RTStrmPrintf(pStrm, " %c%s:\n", RT_C_TO_UPPER(pHelp->pszBrief[0]), pHelp->pszBrief + 1);
- cPendingBlankLines = printStringTable(pStrm, &pHelp->Synopsis, REFENTRYSTR_SCOPE_GLOBAL, cPendingBlankLines);
- if (!cPendingBlankLines)
- cPendingBlankLines = 1;
+ while (cPendingBlankLines-- > 0)
+ RTStrmPutCh(pStrm, '\n');
+ RTStrmPrintf(pStrm, " %c%s:\n", RT_C_TO_UPPER(pHelp->pszBrief[0]), pHelp->pszBrief + 1);
+ cPendingBlankLines = printStringTable(pStrm, &pHelp->Synopsis, REFENTRYSTR_SCOPE_GLOBAL, 0);
+ cPendingBlankLines = RT_MAX(cPendingBlankLines, 1);
}
}
-
#endif
}