Changeset 44362 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 24, 2013 9:11:05 PM (12 years ago)

Author:

vboxsync

Message:

PATM: Changed two Main APIs to use PUVM instead of PVM (one of them directly accessed it). Lot's of function scope cleanups.

File:

• trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -297 +297 @@
 
     AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+    if (FAILED(autoCaller.rc()))
+        return autoCaller.rc();
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    Console::SafeVMPtrQuiet pVM (mParent);
-
-    if (pVM.isOk())
-        *aEnabled = PATMIsEnabled (pVM.raw());
+    Console::SafeVMPtrQuiet ptrVM(mParent);
+    if (ptrVM.isOk())
+        *aEnabled = PATMR3IsEnabled (ptrVM.rawUVM());
     else
         *aEnabled = false;
@@ -333 +333 @@
     }
 
-    Console::SafeVMPtr pVM(mParent);
-    if (FAILED(pVM.rc())) return pVM.rc();
-
-    PATMR3AllowPatching (pVM, aEnable);
+    Console::SafeVMPtr ptrVM(mParent);
+    if (FAILED(ptrVM.rc()))
+        return ptrVM.rc();
+
+    int vrc = PATMR3AllowPatching(ptrVM.rawUVM(), RT_BOOL(aEnable));
+    if (RT_FAILURE(vrc))
+        return setError(VBOX_E_VM_ERROR, tr("PATMR3AllowPatching returned %Rrc"), vrc);
 
     return S_OK;