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

Timestamp:

Feb 28, 2014 3:41:58 PM (11 years ago)

Author:

vboxsync

Message:

Main/MachineImpl: well, if we use a counter there is no point in referencing the service more than once. Just make sure it is referenced at least once when the VM is powered on and all references are removed once the session machine is destroyed

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (2 diffs)

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

@@ -13066 +13066 @@
     }
 
+    /* Remove all references to the NAT network service. The service will stop
+     * if all references (also from other VMs) are removed. */
     for (; miNATNetworksStarted > 0; miNATNetworksStarted--)
     {
@@ -13259 +13261 @@
         mData->mSession.mProgress->setOtherProgressObject(aProgress);
 
-    for (ULONG slot = 0; slot < mNetworkAdapters.size(); slot++)
-    {
-        NetworkAttachmentType_T type;
-        HRESULT hrc;
-        hrc = mNetworkAdapters[slot]->COMGETTER(AttachmentType)(&type);
-        if (   SUCCEEDED(hrc)
-            && type == NetworkAttachmentType_NATNetwork)
-        {
-            Bstr name;
-            hrc = mNetworkAdapters[slot]->COMGETTER(NATNetwork)(name.asOutParam());
-            if (SUCCEEDED(hrc))
+    /* If we didn't reference the NAT network service yet, add a reference to
+     * force a start */
+    if (miNATNetworksStarted < 1)
+    {
+        for (ULONG slot = 0; slot < mNetworkAdapters.size(); slot++)
+        {
+            NetworkAttachmentType_T type;
+            HRESULT hrc;
+            hrc = mNetworkAdapters[slot]->COMGETTER(AttachmentType)(&type);
+            if (   SUCCEEDED(hrc)
+                && type == NetworkAttachmentType_NATNetwork)
             {
-                LogRel(("VM '%s' starts using NAT network '%ls'\n",
-                        mUserData->s.strName.c_str(), name.raw()));
-                mPeer->lockHandle()->unlockWrite();
-                mParent->i_natNetworkRefInc(name.raw());
+                Bstr name;
+                hrc = mNetworkAdapters[slot]->COMGETTER(NATNetwork)(name.asOutParam());
+                if (SUCCEEDED(hrc))
+                {
+                    LogRel(("VM '%s' starts using NAT network '%ls'\n",
+                            mUserData->s.strName.c_str(), name.raw()));
+                    mPeer->lockHandle()->unlockWrite();
+                    mParent->i_natNetworkRefInc(name.raw());
 #ifdef RT_LOCK_STRICT
-                mPeer->lockHandle()->lockWrite(RT_SRC_POS);
+                    mPeer->lockHandle()->lockWrite(RT_SRC_POS);
 #else
-                mPeer->lockHandle()->lockWrite();
+                    mPeer->lockHandle()->lockWrite();
 #endif
+                }
             }
         }
-    }
-
-    miNATNetworksStarted++;
+        miNATNetworksStarted++;
+    }
 
     LogFlowThisFunc(("returns S_OK.\n"));