Changeset 33294 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Oct 21, 2010 10:45:26 AM (14 years ago)

Author:

vboxsync

Message:

Main: API change, merge IVirtualBox::getMachine() with findMachine()

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -793 +793 @@
         ComPtr<IMachine> m;
 
-        /* find ID by name */
-        if (id.isEmpty())
-        {
-            rc = virtualBox->FindMachine(Bstr(name).raw(), m.asOutParam());
-            if (FAILED(rc))
-            {
-                LogError("Invalid machine name!\n", rc);
-                break;
-            }
-            m->COMGETTER(Id)(id.asOutParam());
-            AssertComRC(rc);
-            if (FAILED(rc))
-                break;
-        }
-        else
-        {
-            /* Use the GUID. */
-            rc = virtualBox->GetMachine(id.raw(), m.asOutParam());
-            if (FAILED(rc))
-            {
-                LogError("Invalid machine uid!\n", rc);
-                break;
-            }
-        }
+        rc = virtualBox->FindMachine(Bstr(name).raw(), m.asOutParam());
+        if (FAILED(rc))
+        {
+            LogError("Invalid machine name or UUID!\n", rc);
+            break;
+        }
+        m->COMGETTER(Id)(id.asOutParam());
+        AssertComRC(rc);
+        if (FAILED(rc))
+            break;
 
         Log(("VBoxHeadless: Opening a session with machine (id={%s})...\n",