Changeset 35694 in vbox for trunk/src/VBox/VMM/VMMR3/CSAM.cpp

Timestamp:

Jan 24, 2011 5:35:59 PM (14 years ago)

Author:

vboxsync

Message:

Debugger console: more cleanup.

File:

• trunk/src/VBox/VMM/VMMR3/CSAM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/CSAM.cpp

@@ -2663 +2663 @@
 
 #ifdef VBOX_WITH_DEBUGGER
+
 /**
  * The '.csamoff' command.
@@ -2675 +2676 @@
 static DECLCALLBACK(int) csamr3CmdOff(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult)
 {
-    /*
-     * Validate input.
-     */
-    if (!pVM)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: The command requires VM to be selected.\n");
-
-    CSAMDisableScanning(pVM);
-    return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "CSAM Scanning disabled\n");
+    DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM);
+
+    int rc = CSAMDisableScanning(pVM);
+    if (RT_FAILURE(rc))
+        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "CSAMDisableScanning");
+    return DBGCCmdHlpPrintf(pCmdHlp, "CSAM Scanning disabled\n");
 }
 
@@ -2697 +2696 @@
 static DECLCALLBACK(int) csamr3CmdOn(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult)
 {
-    /*
-     * Validate input.
-     */
-    if (!pVM)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: The command requires VM to be selected.\n");
-
-    CSAMEnableScanning(pVM);
-    return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "CSAM Scanning enabled\n");
-}
-#endif
+    DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM);
+
+    int rc = CSAMEnableScanning(pVM);
+    if (RT_FAILURE(rc))
+        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "CSAMEnableScanning");
+    return DBGCCmdHlpPrintf(pCmdHlp, "CSAM Scanning enabled\n");
+}
+
+#endif /* VBOX_WITH_DEBUGGER */