Changeset 30002 in vbox for trunk

Timestamp:

Jun 2, 2010 3:59:56 PM (15 years ago)

Author:

vboxsync

Message:

Main: do not fail if VMM device port cannot be found

File:

• trunk/src/VBox/Main/GuestImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -273 +273 @@
         {
             PPDMIVMMDEVPORT pVMMDevPort = pVMMDev->getVMMDevPort();
-            ComAssertRet(pVMMDevPort, E_FAIL);
-            pVMMDevPort->pfnSetMemoryBalloon(pVMMDevPort, aMemoryBalloonSize);
+            if (pVMMDevPort)
+                pVMMDevPort->pfnSetMemoryBalloon(pVMMDevPort, aMemoryBalloonSize);
         }
     }
@@ -307 +307 @@
     {
         PPDMIVMMDEVPORT pVMMDevPort = pVMMDev->getVMMDevPort();
-        ComAssertRet(pVMMDevPort, E_FAIL);
-        pVMMDevPort->pfnSetStatisticsInterval(pVMMDevPort, aUpdateInterval);
+        if (pVMMDevPort)
+            pVMMDevPort->pfnSetStatisticsInterval(pVMMDevPort, aUpdateInterval);
     }
 
@@ -405 +405 @@
     {
         PPDMIVMMDEVPORT pVMMDevPort = pVMMDev->getVMMDevPort();
-        ComAssertRet(pVMMDevPort, E_FAIL);
-
-        uint32_t u32Flags = VMMDEV_SETCREDENTIALS_GUESTLOGON;
-        if (!aAllowInteractiveLogon)
-            u32Flags = VMMDEV_SETCREDENTIALS_NOLOCALLOGON;
-
-        pVMMDevPort->pfnSetCredentials(pVMMDevPort,
-            Utf8Str(aUserName).raw(), Utf8Str(aPassword).raw(),
-            Utf8Str(aDomain).raw(), u32Flags);
-        return S_OK;
+        if (pVMMDevPort)
+        {
+            uint32_t u32Flags = VMMDEV_SETCREDENTIALS_GUESTLOGON;
+            if (!aAllowInteractiveLogon)
+                u32Flags = VMMDEV_SETCREDENTIALS_NOLOCALLOGON;
+
+            pVMMDevPort->pfnSetCredentials(pVMMDevPort,
+                                           Utf8Str(aUserName).raw(),
+                                           Utf8Str(aPassword).raw(),
+                                           Utf8Str(aDomain).raw(),
+                                           u32Flags);
+            return S_OK;
+        }
     }