Changeset 30938 in vbox

Timestamp:

Jul 20, 2010 5:32:27 PM (15 years ago)

Author:

vboxsync

Message:

Main: add option to VirtualBox::findMachine() whether it should find inaccessible machines as well (fixes VBoxManage unregistervm trunk regression introduced by r62441)

Location:

trunk/src/VBox/Main

Files:

• VirtualBoxImpl.cpp (modified) (8 diffs)
• include/VirtualBoxImpl.h (modified) (1 diff)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1310 +1310 @@
 
     ComObjPtr<Machine> machine;
-    HRESULT rc = findMachine(Guid(aId), true /* setError */, &machine);
+    HRESULT rc = findMachine(Guid(aId),
+                             true /* fPermitInaccessible */,
+                             true /* setError */,
+                             &machine);
 
     /* the below will set *aMachine to NULL if machine is null */
@@ -1381 +1384 @@
     // find machine from the given ID
     ComObjPtr<Machine> pMachine;
-    HRESULT rc = findMachine(id, true /* setError */, &pMachine);
+    HRESULT rc = findMachine(id,
+                             true /* fPermitInaccessible */,
+                             true /* setError */,
+                             &pMachine);
     if (FAILED(rc)) return rc;
 
@@ -1949 +1955 @@
     ComObjPtr<Machine> machine;
 
-    HRESULT rc = findMachine(id, true /* setError */, &machine);
+    HRESULT rc = findMachine(id,
+                             false /* fPermitInaccessible */,
+                             true /* setError */,
+                             &machine);
     if (FAILED(rc)) return rc;
 
@@ -2005 +2014 @@
     ComObjPtr<Machine> machine;
 
-    HRESULT rc = findMachine(id, true /* setError */, &machine);
+    HRESULT rc = findMachine(id,
+                             false /* fPermitInaccessible */,
+                             true /* setError */,
+                             &machine);
     if (FAILED(rc)) return rc;
 
@@ -2071 +2083 @@
     ComObjPtr<Machine> machine;
 
-    HRESULT rc = findMachine(id, true /* setError */, &machine);
+    HRESULT rc = findMachine(id,
+                             false /* fPermitInaccessible */,
+                             true /* setError */,
+                             &machine);
     if (FAILED(rc)) return rc;
 
@@ -2842 +2857 @@
 
 /**
- *  Searches for a Machine object with the given ID in the collection
+ *  Searches for a machine object with the given ID in the collection
  *  of registered machines.
  *
- *  @param id
- *      ID of the machine
- *  @param doSetError
- *      if TRUE, the appropriate error info is set in case when the machine
- *      is not found
- *  @param machine
- *      where to store the found machine object (can be NULL)
- *
- *  @return
- *      S_OK when found or VBOX_E_OBJECT_NOT_FOUND when not found
- *
- *  @note Locks this object for reading.
+ * @param aId Machine UUID to look for.
+ * @param aPermitInaccessible If true, inaccessible machines will be found;
+ *                  if false, this will fail if the given machine is inaccessible.
+ * @param aSetError If true, set errorinfo if the machine is not found.
+ * @param aMachine Returned machine, if found.
+ * @return
  */
 HRESULT VirtualBox::findMachine(const Guid &aId,
+                                bool fPermitInaccessible,
                                 bool aSetError,
                                 ComObjPtr<Machine> *aMachine /* = NULL */)
@@ -2875 +2885 @@
         {
             ComObjPtr<Machine> pMachine2 = *it;
-            AutoCaller machCaller(pMachine2);
-            /* skip inaccessible machines */
-            if (FAILED(machCaller.rc()))
-                continue;
+
+            if (!fPermitInaccessible)
+            {
+                // skip inaccessible machines
+                AutoCaller machCaller(pMachine2);
+                if (FAILED(machCaller.rc()))
+                    continue;
+            }
 
             if (pMachine2->getId() == aId)
@@ -3555 +3569 @@
     {
         ComObjPtr<Machine> pMachine;
-        rc = findMachine(aMachine->getId(), false /* aDoSetError */, &pMachine);
+        rc = findMachine(aMachine->getId(),
+                         true /* fPermitInaccessible */,
+                         false /* aDoSetError */,
+                         &pMachine);
         if (SUCCEEDED(rc))
         {

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -227 +227 @@
     }
 
-    HRESULT findMachine (const Guid &aId, bool aSetError,
+    HRESULT findMachine (const Guid &aId,
+                         bool fPermitInaccessible,
+                         bool aSetError,
                          ComObjPtr<Machine> *machine = NULL);