Changeset 33408 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Oct 25, 2010 9:57:32 AM (15 years ago)

Author:

vboxsync

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

66997

Message:

Removed VBOX_DYNAMIC_NET_ATTACH, we don't need to keep this optional.

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (4 diffs)
• DevPCNet.cpp (modified) (3 diffs)
• DevVirtioNet.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -5298 +5298 @@
 }
 
+
 /* -=-=-=-=- PDMDEVREG -=-=-=-=- */
-
-#ifdef VBOX_DYNAMIC_NET_ATTACH
 
 /**
@@ -5334 +5333 @@
     PDMCritSectLeave(&pState->cs);
 }
-
 
 /**
@@ -5411 +5409 @@
 
 }
-
-#endif /* VBOX_DYNAMIC_NET_ATTACH */
 
 /**
@@ -5972 +5968 @@
     /* Resume notification - optional. */
     NULL,
-#ifdef VBOX_DYNAMIC_NET_ATTACH
     /* Attach command - optional. */
     e1kAttach,
     /* Detach notification - optional. */
     e1kDetach,
-#else /* !VBOX_DYNAMIC_NET_ATTACH */
-    /* Attach command - optional. */
-    NULL,
-    /* Detach notification - optional. */
-    NULL,
-#endif /* !VBOX_DYNAMIC_NET_ATTACH */
     /* Query a LUN base interface - optional. */
     NULL,

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -4826 +4826 @@
 }
 
-#ifdef VBOX_DYNAMIC_NET_ATTACH
 
 /**
@@ -4926 +4925 @@
 }
 
-#endif /* VBOX_DYNAMIC_NET_ATTACH */
 
 /**
@@ -5411 +5409 @@
     /* pfnResume */
     NULL,
-#ifdef VBOX_DYNAMIC_NET_ATTACH
     /* pfnAttach */
     pcnetAttach,
     /* pfnDetach */
     pcnetDetach,
-#else /* !VBOX_DYNAMIC_NET_ATTACH */
-    /* pfnAttach */
-    NULL,
-    /* pfnDetach */
-    NULL,
-#endif /* !VBOX_DYNAMIC_NET_ATTACH */
     /* pfnQueryInterface. */
     NULL,

trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

@@ -1700 +1700 @@
 }
 
+
 /* -=-=-=-=- PDMDEVREG -=-=-=-=- */
-
-#ifdef VBOX_DYNAMIC_NET_ATTACH
 
 /**
@@ -1735 +1734 @@
     vnetCsLeave(pState);
 }
-
 
 /**
@@ -1803 +1801 @@
 
 }
-
-#endif /* VBOX_DYNAMIC_NET_ATTACH */
 
 /**
@@ -2084 +2080 @@
     /* Resume notification - optional. */
     NULL,
-#ifdef VBOX_DYNAMIC_NET_ATTACH
     /* Attach command - optional. */
     vnetAttach,
     /* Detach notification - optional. */
     vnetDetach,
-#else /* !VBOX_DYNAMIC_NET_ATTACH */
-    /* Attach command - optional. */
-    NULL,
-    /* Detach notification - optional. */
-    NULL,
-#endif /* !VBOX_DYNAMIC_NET_ATTACH */
     /* Query a LUN base interface - optional. */
     NULL,