Changeset 34913 in vbox

Timestamp:

Dec 9, 2010 5:20:41 PM (14 years ago)

Author:

vboxsync

Message:

VBoxManage: Added a debugvm command for injectnmi and dumpguestcore.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/Makefile.kmk (modified) (1 diff)
• Frontends/VBoxManage/VBoxManage.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManage.h (modified) (2 diffs)
• Frontends/VBoxManage/VBoxManageControlVM.cpp (modified) (2 diffs)
• Frontends/VBoxManage/VBoxManageDebugVM.cpp (added)
• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (3 diffs)
• Main/MachineDebuggerImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -36 +36 @@
         VBoxInternalManage.cpp \
         VBoxManageControlVM.cpp \
+        VBoxManageDebugVM.cpp \
         VBoxManageDHCPServer.cpp \
         VBoxManageDisk.cpp \

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

@@ -432 +432 @@
             { "extpack",          USAGE_EXTPACK,           handleExtPack},
             { "bandwidthctl",     USAGE_BANDWIDTHCONTROL,  handleBandwidthControl},
+            { "debugvm",          USAGE_DEBUGVM,           handleDebugVM},
             { NULL,               0,                       NULL }
         };

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -98 +98 @@
 #define USAGE_EXTPACK               RT_BIT_64(55)
 #define USAGE_BANDWIDTHCONTROL      RT_BIT_64(56)
+#define USAGE_DEBUGVM               RT_BIT_64(57)
 #define USAGE_ALL                   (~(uint64_t)0)
 /** @} */
@@ -166 +167 @@
 /* VBoxManageModifyVM.cpp */
 int handleModifyVM(HandlerArg *a);
+
+/* VBoxManageDebugVM.cpp */
+int handleDebugVM(HandlerArg *a);
 
 /* VBoxManageGuestProp.cpp */

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBoxManage - Implementation of controlvm command.
+ * VBoxManage - Implementation of the controlvm command.
  */
 
@@ -1015 +1015 @@
         else
         {
-            errorSyntax(USAGE_CONTROLVM, "Invalid parameter '%s'", Utf8Str(a->argv[1]).c_str());
+            errorSyntax(USAGE_CONTROLVM, "Invalid parameter '%s'", a->argv[1]);
             rc = E_FAIL;
         }

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

@@ -22 +22 @@
 #include <VBox/version.h>
 
+#include <iprt/buildconfig.h>
 #include <iprt/ctype.h>
 #include <iprt/err.h>
@@ -676 +677 @@
                      "\n");
     }
+    if (u64Cmd & USAGE_DEBUGVM)
+    {
+        RTStrmPrintf(pStrm,
+                     "VBoxManage debugvm          <uuid>|<name>\n"
+                     "                            injectnmi |\n"
+                     "                            dumpguestcore --filename <name>\n"
+                     "\n");
+    }
 }
 
@@ -709 +718 @@
 RTEXITCODE errorGetOpt(USAGECATEGORY fUsageCategory, int rc, union RTGETOPTUNION const *pValueUnion)
 {
+    /*
+     * Check if it is an unhandled standard option.
+     */
+    if (rc == 'V')
+    {
+        RTPrintf("%sr%d\n", VBOX_VERSION_STRING, RTBldCfgRevision());
+        return RTEXITCODE_SUCCESS;
+    }
+
+    if (rc == 'h')
+    {
+        showLogo(g_pStdErr);
+#ifndef VBOX_ONLY_DOCS
+        if (g_fInternalMode)
+            printUsageInternal(fUsageCategory, g_pStdOut);
+        else
+            printUsage(fUsageCategory, g_pStdOut);
+#endif
+        return RTEXITCODE_SUCCESS;
+    }
+
+    /*
+     * General failure.
+     */
     showLogo(g_pStdErr); // show logo even if suppressed
 #ifndef VBOX_ONLY_DOCS

trunk/src/VBox/Main/MachineDebuggerImpl.cpp

@@ -727 +727 @@
 
     AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    Console::SafeVMPtr pVM(mParent);
-    if (FAILED(pVM.rc())) return pVM.rc();
-
-    HWACCMR3InjectNMI(pVM);
-
-    return S_OK;
+    HRESULT hrc = autoCaller.rc();
+    if (SUCCEEDED(hrc))
+    {
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+        Console::SafeVMPtr ptrVM(mParent);
+        hrc = ptrVM.rc();
+        if (SUCCEEDED(hrc))
+        {
+            int vrc = HWACCMR3InjectNMI(ptrVM);
+            if (RT_SUCCESS(vrc))
+                hrc = S_OK;
+            else
+                hrc = setError(E_FAIL, tr("HWACCMR3InjectNMI failed with %Rrc"), vrc);
+        }
+    }
+    return hrc;
 }