Changeset 20631 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jun 16, 2009 2:03:45 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

48708

Message:

NetworkAttachment: shifted the configuration to a new function configNetwork().

File:

• trunk/src/VBox/Main/include/ConsoleImpl.h (modified) (2 diffs)

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

@@ -430 +430 @@
 
     static DECLCALLBACK(int) configConstructor(PVM pVM, void *pvConsole);
+    static DECLCALLBACK(int) configNetwork(Console *pThis, const char *pszDevice,
+                                           unsigned uInstance, unsigned uLun,
+                                           NetworkAttachmentType_T eAttachmentType,
+                                           NetworkAttachmentType_T *meAttachmentType,
+                                           INetworkAdapter *aNetworkAdapter,
+                                           PCFGMNODE pCfg, PCFGMNODE pLunL0,
+                                           PCFGMNODE pInst, bool attachDetach);
     static DECLCALLBACK(void) vmstateChangeCallback(PVM aVM, VMSTATE aState,
                                                     VMSTATE aOldState, void *aUser);
@@ -551 +558 @@
      * This does not have to match the state maintained in the Floppy. */
     DriveState_T meFloppyState;
-#ifdef VBOX_DYNAMIC_NET_ATTACH
     /** The current network attachment type in the VM.
      * This does not have to match the state maintained in the NetworkAdapter. */
-    NetworkAttachmentType_T meAttachmentType[SchemaDefs::NetworkAdapterCount];
-#endif /* VBOX_DYNAMIC_NET_ATTACH */
+    static NetworkAttachmentType_T meAttachmentType[SchemaDefs::NetworkAdapterCount];
 
     VMMDev * const mVMMDev;