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

Timestamp:

Dec 16, 2011 11:27:51 PM (13 years ago)

Author:

vboxsync

Message:

DBGF,Main,VBoxManage: added target logger prefixes (release:/debug:). Implemented logger modifier methods in IMachineDebugger. Exposed these methods in VBoxManage debugvm.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

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

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

@@ -150 +150 @@
     return RTEXITCODE_SUCCESS;
 }
+
+/**
+ * Handles the log sub-command.
+ *
+ * @returns Suitable exit code.
+ * @param   pArgs               The handler arguments.
+ * @param   pDebugger           Pointer to the debugger interface.
+ * @param   pszSubCmd           The sub command.
+ */
+static RTEXITCODE handleDebugVM_LogXXXX(HandlerArg *pArgs, IMachineDebugger *pDebugger, const char *pszSubCmd)
+{
+    /*
+     * Parse arguments.
+     */
+    bool                        fRelease = false;
+    com::Utf8Str                strSettings;
+
+    RTGETOPTSTATE               GetState;
+    RTGETOPTUNION               ValueUnion;
+    static const RTGETOPTDEF    s_aOptions[] =
+    {
+        { "--release",      'r', RTGETOPT_REQ_NOTHING },
+    };
+    int rc = RTGetOptInit(&GetState, pArgs->argc, pArgs->argv, s_aOptions, RT_ELEMENTS(s_aOptions), 2, 0 /*fFlags*/);
+    AssertRCReturn(rc, RTEXITCODE_FAILURE);
+
+    while ((rc = RTGetOpt(&GetState, &ValueUnion)) != 0)
+    {
+        switch (rc)
+        {
+            case 'r':
+                fRelease = true;
+                break;
+
+            case 'd':
+                fRelease = false;
+                break;
+
+            case VINF_GETOPT_NOT_OPTION:
+                if (strSettings.length() == 0)
+                    strSettings = ValueUnion.psz;
+                else
+                {
+                    strSettings.append(' ');
+                    strSettings.append(ValueUnion.psz);
+                }
+                break;
+
+            default:
+                return errorGetOpt(USAGE_DEBUGVM, rc, &ValueUnion);
+        }
+    }
+
+    if (fRelease)
+    {
+        com::Utf8Str strTmp(strSettings);
+        strSettings = "release: ";
+        strSettings.append(strTmp);
+    }
+
+    com::Bstr bstrSettings(strSettings);
+    if (!strcmp(pszSubCmd, "log"))
+        CHECK_ERROR2_RET(pDebugger, ModifyLogGroups(bstrSettings.raw()), RTEXITCODE_FAILURE);
+    else if (!strcmp(pszSubCmd, "logdest"))
+        CHECK_ERROR2_RET(pDebugger, ModifyLogDestinations(bstrSettings.raw()), RTEXITCODE_FAILURE);
+    else if (!strcmp(pszSubCmd, "logflags"))
+        CHECK_ERROR2_RET(pDebugger, ModifyLogFlags(bstrSettings.raw()), RTEXITCODE_FAILURE);
+    else
+        AssertFailedReturn(RTEXITCODE_FAILURE);
+
+    return RTEXITCODE_SUCCESS;
+}
+
 
 /**
@@ -442 +515 @@
             else if (!strcmp(pszSubCmd, "injectnmi"))
                 rcExit = handleDebugVM_InjectNMI(pArgs, ptrDebugger);
+            else if (!strcmp(pszSubCmd, "log"))
+                rcExit = handleDebugVM_LogXXXX(pArgs, ptrDebugger, pszSubCmd);
+            else if (!strcmp(pszSubCmd, "logdest"))
+                rcExit = handleDebugVM_LogXXXX(pArgs, ptrDebugger, pszSubCmd);
+            else if (!strcmp(pszSubCmd, "logflags"))
+                rcExit = handleDebugVM_LogXXXX(pArgs, ptrDebugger, pszSubCmd);
             else if (!strcmp(pszSubCmd, "osdetect"))
                 rcExit = handleDebugVM_OSDetect(pArgs, ptrDebugger);

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

@@ -645 +645 @@
                      "                            info <item> [args] |\n"
                      "                            injectnmi |\n"
+                     "                            log [--release|--debug] <settings> ...|\n"
+                     "                            logdest [--release|--debug] <settings> ...|\n"
+                     "                            logflags [--release|--debug] <settings> ...|\n"
                      "                            osdetect |\n"
                      "                            osinfo |\n"