Changeset 15827 in vbox

Timestamp:

Jan 7, 2009 10:22:15 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

41413

Message:

#3285: Improve error handling API to include unique error numbers

• return E_FAIL when !pVM.isOk() like GetStats does.
• Move InjectNMI() from the accessors down to the methods for consistency.

File:

• trunk/src/VBox/Main/MachineDebuggerImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/MachineDebuggerImpl.cpp

@@ -340 +340 @@
 
 /**
- * Set the new patch manager enabled flag.
- *
- * @returns COM status code
- * @param   new patch manager enabled flag
- */
-STDMETHODIMP MachineDebugger::InjectNMI()
-{
-    LogFlowThisFunc ((""));
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
-
-    Console::SafeVMPtr pVM (mParent);
-    CheckComRCReturnRC (pVM.rc());
-
-    HWACCMR3InjectNMI(pVM);
-
-    return S_OK;
-}
-
-/**
  * Returns the current code scanner enabled flag.
  *
@@ -694 +671 @@
     Console::SafeVMPtrQuiet pVM (mParent);
 
-    if (pVM.isOk())
-        STAMR3Reset (pVM, Utf8Str (aPattern).raw());
+    if (!pVM.isOk())
+        return E_FAIL;
+
+    STAMR3Reset (pVM, Utf8Str (aPattern).raw());
 
     return S_OK;
@@ -710 +689 @@
     Console::SafeVMPtrQuiet pVM (mParent);
 
-    if (pVM.isOk())
-        STAMR3Dump (pVM, Utf8Str (aPattern).raw());
+    if (!pVM.isOk())
+        return E_FAIL;
+
+    STAMR3Dump (pVM, Utf8Str (aPattern).raw());
 
     return S_OK;
@@ -742 +723 @@
      * of the amount statistics in a debug build. */
     Bstr (pszSnapshot).cloneTo (aStats);
+
+    return S_OK;
+}
+
+/**
+ * Set the new patch manager enabled flag.
+ *
+ * @returns COM status code
+ * @param   new patch manager enabled flag
+ */
+STDMETHODIMP MachineDebugger::InjectNMI()
+{
+    LogFlowThisFunc ((""));
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoWriteLock alock (this);
+
+    Console::SafeVMPtr pVM (mParent);
+    CheckComRCReturnRC (pVM.rc());
+
+    HWACCMR3InjectNMI(pVM);
 
     return S_OK;