Changeset 22455 in vbox

Timestamp:

Aug 26, 2009 8:32:32 AM (15 years ago)

Author:

vboxsync

Message:

ConsoleImpl: meAttachmentType shouldn't be static

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (2 diffs)
• ConsoleImpl2.cpp (modified) (2 diffs)
• include/ConsoleImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -243 +243 @@
     , mVMStateChangeCallbackDisabled (false)
     , mMachineState (MachineState_PoweredOff)
-{}
+{
+    for (ULONG slot = 0; slot < SchemaDefs::NetworkAdapterCount; slot ++)
+        meAttachmentType[slot] = NetworkAttachmentType_Null;
+}
 
 Console::~Console()
@@ -7680 +7683 @@
 };
 
-/**
- * Initializing the attachment type for the network adapters
- */
-NetworkAttachmentType_T Console::meAttachmentType[] = {};
-
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2127 +2127 @@
     {
         const char *pszNetDriver = "IntNet";
-        if (meAttachmentType[uInstance] == NetworkAttachmentType_NAT)
+        if (pThis->meAttachmentType[uInstance] == NetworkAttachmentType_NAT)
             pszNetDriver = "NAT";
 #if !defined(VBOX_WITH_NETFLT) && defined(RT_OS_LINUX)
-        if (meAttachmentType[uInstance] == NetworkAttachmentType_Bridged)
+        if (pThis->meAttachmentType[uInstance] == NetworkAttachmentType_Bridged)
             pszNetDriver = "HostInterface";
 #endif
@@ -2853 +2853 @@
     }
 
-    meAttachmentType[uInstance] = eAttachmentType;
+    pThis->meAttachmentType[uInstance] = eAttachmentType;
 
 #undef STR_FREE

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

@@ -564 +564 @@
      * change the network attachment dynamically.
      */
-    static NetworkAttachmentType_T meAttachmentType[SchemaDefs::NetworkAdapterCount];
+    NetworkAttachmentType_T meAttachmentType[SchemaDefs::NetworkAdapterCount];
 
     VMMDev * const mVMMDev;