Changeset 42875 in vbox for trunk/src

Timestamp:

Aug 20, 2012 2:11:05 AM (12 years ago)

Author:

vboxsync

Message:

Machine::GetNetworkAdapter: More details. (Testsuite doesn't check for E_INVALIDARG, btw.)

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -4678 +4678 @@
 {
     CheckComArgOutPointerValid(adapter);
-    /* Do not assert in debug builds here in case someone iterates over the
-     * slots and relies on the E_INVALIDARG error. */
+    /* Do not assert if slot is out of range, just return the advertised
+       status.  testdriver/vbox.py triggers this in logVmInfo. */
     if (slot >= mNetworkAdapters.size())
         return setError(E_INVALIDARG,
-                        tr("No network adapter in slot %RU32 found (total %RU32 adapters)"),
+                        tr("No network adapter in slot %RU32 (total %RU32 adapters)"),
                         slot, mNetworkAdapters.size());