Changeset 7324 in vbox for trunk/src/VBox/Main/ConsoleImpl.cpp

Timestamp:

Mar 6, 2008 2:35:17 PM (17 years ago)

Author:

vboxsync

Message:

Save/load implemented. Irq thread. It is highly advised to include VBOX_WITH_PDM_LOCK=1 into your LocalConfig.kmk to avoid interrupt storms in Windows guests.

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3121 +3121 @@
              */
             PPDMIBASE pBase;
-            int vrc = PDMR3QueryDeviceLun (mpVM, "pcnet", (unsigned) ulInstance,
-                                           0, &pBase);
+            const char *cszAdapterName = "pcnet";
+#ifdef VBOX_WITH_E1000
+            /*
+             * Perharps it would be much wiser to wrap both 'pcnet' and 'e1000'
+             * into generic 'net' device.
+             */
+            NetworkAdapterType_T adapterType;
+            rc = aNetworkAdapter->COMGETTER(AdapterType)(&adapterType);
+            AssertComRC(rc);
+            if (adapterType == NetworkAdapterType::I82540EM)
+                cszAdapterName = "e1000";
+#endif
+            int vrc = PDMR3QueryDeviceLun (mpVM, cszAdapterName,
+                                           (unsigned) ulInstance, 0, &pBase);
             ComAssertRC (vrc);
             if (VBOX_SUCCESS (vrc))