Changeset 50650 in vbox

Timestamp:

Feb 28, 2014 3:27:51 PM (11 years ago)

Author:

vboxsync

Message:

Main/MachineImpl: don't start the NAT network at SessionMachine::init() but do it at SessionMachine::BeginPowerUp(), otherwise we start the NAT network every time the VM settings are opened.

Location:

trunk/src/VBox/Main

Files:

• include/MachineImpl.h (modified) (1 diff)
• src-server/HostDnsService.cpp (modified) (2 diffs)
• src-server/MachineImpl.cpp (modified) (3 diffs)

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

@@ -1220 +1220 @@
     ClientToken *mClientToken;
 
+    int iNATNetworksStarted;
+
     static DECLCALLBACK(int) taskHandler(RTTHREAD thread, void *pvUser);
 };

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

@@ -289 +289 @@
         updateInfo();
 
-    LogRel(("HostDnsMonitorProxy::GetDomainName:%s\n", m->info->domain.c_str()));
+    LogRel(("HostDnsMonitorProxy::GetDomainName: %s\n", m->info->domain.c_str()));
 
     Utf8Str(m->info->domain.c_str()).cloneTo(aDomainName);
@@ -356 +356 @@
 static void dumpHostDnsStrVector(const std::string& prefix, const std::vector<std::string>& v)
 {
-    int i = 0;
+    int i = 1;
     for (std::vector<std::string>::const_iterator it = v.begin();
          it != v.end();

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

@@ -12873 +12873 @@
         unconst(mNetworkAdapters[slot]).createObject();
         mNetworkAdapters[slot]->init(this, aMachine->mNetworkAdapters[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))
-            {
-                LogRel(("VM '%s' starts using NAT network '%ls'\n",
-                        mUserData->s.strName.c_str(), name.raw()));
-                aMachine->lockHandle()->unlockWrite();
-                mParent->i_natNetworkRefInc(name.raw());
-#ifdef RT_LOCK_STRICT
-                aMachine->lockHandle()->lockWrite(RT_SRC_POS);
-#else
-                aMachine->lockHandle()->lockWrite();
-#endif
-            }
-        }
     }
 
@@ -13086 +13064 @@
     }
 
-    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 (iNATNetworksStarted)
+    {
+        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)
             {
-                multilock.release();
-                LogRel(("VM '%s' stops using NAT network '%ls'\n",
-                        mUserData->s.strName.c_str(), name.raw()));
-                mParent->i_natNetworkRefDec(name.raw());
-                multilock.acquire();
+                Bstr name;
+                hrc = mNetworkAdapters[slot]->COMGETTER(NATNetwork)(name.asOutParam());
+                if (SUCCEEDED(hrc))
+                {
+                    multilock.release();
+                    LogRel(("VM '%s' stops using NAT network '%ls'\n",
+                            mUserData->s.strName.c_str(), name.raw()));
+                    mParent->i_natNetworkRefDec(name.raw());
+                    multilock.acquire();
+                }
             }
         }
+        iNATNetworksStarted--;
     }
 
@@ -13275 +13257 @@
     if (!mData->mSession.mProgress.isNull())
         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))
+            {
+                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);
+#else
+                mPeer->lockHandle()->lockWrite();
+#endif
+            }
+        }
+    }
+
+    iNATNetworksStarted++;
 
     LogFlowThisFunc(("returns S_OK.\n"));