Changeset 56090 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 27, 2015 11:25:58 AM (10 years ago)

Author:

vboxsync

Message:

VBoxManage: Added vmdebug osdmesg.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageDebugVM.cpp (modified) (4 diffs)
• VBoxManageHelp.cpp (modified) (1 diff)

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

@@ -293 +293 @@
 
 /**
- * Handles the os sub-command.
+ * Handles the osdetect sub-command.
  *
  * @returns Suitable exit code.
@@ -315 +315 @@
 
 /**
- * Handles the os sub-command.
+ * Handles the osinfo sub-command.
  *
  * @returns Suitable exit code.
@@ -332 +332 @@
     RTPrintf("Name:    %ls\n", bstrName.raw());
     RTPrintf("Version: %ls\n", bstrVersion.raw());
+    return RTEXITCODE_SUCCESS;
+}
+
+/**
+ * Handles the osdmsg sub-command.
+ *
+ * @returns Suitable exit code.
+ * @param   pArgs               The handler arguments.
+ * @param   pDebugger           Pointer to the debugger interface.
+ */
+static RTEXITCODE handleDebugVM_OSDmesg(HandlerArg *pArgs, IMachineDebugger *pDebugger)
+{
+    /*
+     * Parse argument.
+     */
+    uint32_t                    uMaxMessages = 0;
+    RTGETOPTSTATE               GetState;
+    RTGETOPTUNION               ValueUnion;
+    static const RTGETOPTDEF    s_aOptions[] =
+    {
+        { "--lines", 'n', 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 'n': uMaxMessages = ValueUnion.u32; break;
+            default: return errorGetOpt(USAGE_DEBUGVM, rc, &ValueUnion);
+        }
+
+    /*
+     * Do it.
+     */
+    com::Bstr bstrDmesg;
+    CHECK_ERROR2_RET(pDebugger, QueryOSKernelLog(uMaxMessages, bstrDmesg.asOutParam()), RTEXITCODE_FAILURE);
+    RTPrintf("%ls\n", bstrDmesg.raw());
     return RTEXITCODE_SUCCESS;
 }
@@ -685 +722 @@
             else if (!strcmp(pszSubCmd, "osinfo"))
                 rcExit = handleDebugVM_OSInfo(pArgs, ptrDebugger);
+            else if (!strcmp(pszSubCmd, "osdmesg"))
+                rcExit = handleDebugVM_OSDmesg(pArgs, ptrDebugger);
             else if (!strcmp(pszSubCmd, "setregisters"))
                 rcExit = handleDebugVM_SetRegisters(pArgs, ptrDebugger);

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

@@ -768 +768 @@
                      "                            osdetect |\n"
                      "                            osinfo |\n"
+                     "                            osdmesg [--lines|-n <N>] |\n"
                      "                            getregisters [--cpu <id>] <reg>|all ... |\n"
                      "                            setregisters [--cpu <id>] <reg>=<value> ... |\n"