Changeset 25993 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 25, 2010 11:04:09 AM (15 years ago)

Author:

vboxsync

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

56864

Message:

DrvIntNet.cpp: Preparing for R0/RC.

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (2 diffs)
• Network/DrvIntNet.cpp (modified) (53 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -509 +509 @@
         Network/DevPCNet.cpp \
         Serial/DevSerial.cpp \
-        Parallel/DevParallel.cpp
+        Parallel/DevParallel.cpp \
+        \
+        Network/DrvIntNet.cpp
 
  ifdef VBOX_DYNAMIC_NET_ATTACH
@@ -608 +610 @@
         Network/DevPCNet.cpp \
         Serial/DevSerial.cpp \
-        Parallel/DevParallel.cpp
+        Parallel/DevParallel.cpp \
+        \
+        Network/DrvIntNet.cpp
 
 ifdef VBOX_DYNAMIC_NET_ATTACH

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -63 +63 @@
 
 /**
- * Block driver instance data.
+ * Internal networking driver instance data.
  *
  * @implements  PDMINETWORKCONNECTOR
@@ -70 +70 @@
 {
     /** The network interface. */
-    PDMINETWORKCONNECTOR    INetworkConnector;
+    PDMINETWORKCONNECTOR            INetworkConnectorR3;
     /** The network interface. */
-    PPDMINETWORKPORT        pPort;
+    R3PTRTYPE(PPDMINETWORKPORT)     pIPortR3;
     /** The network config interface.
      * Can (in theory at least) be NULL. */
-    PPDMINETWORKCONFIG      pConfigIf;
+    R3PTRTYPE(PPDMINETWORKCONFIG)   pIConfigIfR3;
     /** Pointer to the driver instance. */
-    PPDMDRVINS              pDrvIns;
+    PPDMDRVINSR3                    pDrvInsR3;
+    /** Pointer to the communication buffer. */
+    R3PTRTYPE(PINTNETBUF)           pBufR3;
     /** Interface handle. */
-    INTNETIFHANDLE          hIf;
-    /** Pointer to the communication buffer. */
-    PINTNETBUF              pBuf;
+    INTNETIFHANDLE                  hIf;
+
     /** The thread state. */
-    ASYNCSTATE volatile     enmState;
+    ASYNCSTATE volatile             enmState;
     /** Reader thread. */
-    RTTHREAD                Thread;
+    RTTHREAD                        Thread;
     /** Event semaphore the Thread waits on while the VM is suspended. */
-    RTSEMEVENT              EventSuspended;
+    RTSEMEVENT                      EventSuspended;
     /** Set if the link is down.
      * When the link is down all incoming packets will be dropped. */
-    bool volatile           fLinkDown;
+    bool volatile                   fLinkDown;
     /** Set if data transmission should start immediately and deactivate
      * as late as possible. */
-    bool                    fActivateEarlyDeactivateLate;
+    bool                            fActivateEarlyDeactivateLate;
+    /** Padding. */
+    bool                            afReserved[2];
+    /** The network name. */
+    char                            szNetwork[INTNET_MAX_NETWORK_NAME];
 
 #ifdef LOG_ENABLED
     /** The nano ts of the last transfer. */
-    uint64_t                u64LastTransferTS;
+    uint64_t                        u64LastTransferTS;
     /** The nano ts of the last receive. */
-    uint64_t                u64LastReceiveTS;
+    uint64_t                        u64LastReceiveTS;
 #endif
-
 #ifdef VBOX_WITH_STATISTICS
     /** Profiling packet transmit runs. */
-    STAMPROFILE             StatTransmit;
+    STAMPROFILE                     StatTransmit;
     /** Profiling packet receive runs. */
-    STAMPROFILEADV          StatReceive;
+    STAMPROFILEADV                  StatReceive;
 #endif /* VBOX_WITH_STATISTICS */
-
-    /** The network name. */
-    char                    szNetwork[INTNET_MAX_NETWORK_NAME];
-} DRVINTNET, *PDRVINTNET;
-
-
-/** Converts a pointer to DRVINTNET::INetworkConnector to a PDRVINTNET. */
-#define PDMINETWORKCONNECTOR_2_DRVINTNET(pInterface) ( (PDRVINTNET)((uintptr_t)pInterface - RT_OFFSETOF(DRVINTNET, INetworkConnector)) )
-
+} DRVINTNET;
+/** Pointer to instance data of the internal networking driver. */
+typedef DRVINTNET *PDRVINTNET;
+
+
+#ifdef IN_RING3
+
+/* -=-=-=-=- PDMINETWORKCONNECTOR -=-=-=-=- */
+
+/** Converts a pointer to DRVINTNET::INetworkConnectorR3 to a PDRVINTNET. */
+#define PDMINETWORKCONNECTOR_2_DRVINTNET(pInterface) \
+    RT_FROM_MEMBER(pInterface, DRVINTNET, INetworkConnectorR3)
 
 /**
@@ -124 +131 @@
  * @param   pThis       The driver instance.
  */
-static int drvIntNetUpdateMacAddress(PDRVINTNET pThis)
-{
-    if (!pThis->pConfigIf)
+static int drvR3IntNetUpdateMacAddress(PDRVINTNET pThis)
+{
+    if (!pThis->pIConfigIfR3)
         return VINF_SUCCESS;
 
@@ -134 +141 @@
     SetMacAddressReq.pSession = NIL_RTR0PTR;
     SetMacAddressReq.hIf = pThis->hIf;
-    int rc = pThis->pConfigIf->pfnGetMac(pThis->pConfigIf, &SetMacAddressReq.Mac);
+    int rc = pThis->pIConfigIfR3->pfnGetMac(pThis->pIConfigIfR3, &SetMacAddressReq.Mac);
     if (RT_SUCCESS(rc))
-        rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvIns, VMMR0_DO_INTNET_IF_SET_MAC_ADDRESS,
+        rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SET_MAC_ADDRESS,
                                      &SetMacAddressReq, sizeof(SetMacAddressReq));
 
-    Log(("drvIntNetUpdateMacAddress: %.*Rhxs rc=%Rrc\n", sizeof(SetMacAddressReq.Mac), &SetMacAddressReq.Mac, rc));
+    Log(("drvR3IntNetUpdateMacAddress: %.*Rhxs rc=%Rrc\n", sizeof(SetMacAddressReq.Mac), &SetMacAddressReq.Mac, rc));
     return rc;
 }
@@ -153 +160 @@
  * @param   fActive     The new state.
  */
-static int drvIntNetSetActive(PDRVINTNET pThis, bool fActive)
-{
-    if (!pThis->pConfigIf)
+static int drvR3IntNetSetActive(PDRVINTNET pThis, bool fActive)
+{
+    if (!pThis->pIConfigIfR3)
         return VINF_SUCCESS;
 
@@ -164 +171 @@
     SetActiveReq.hIf = pThis->hIf;
     SetActiveReq.fActive = fActive;
-    int rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvIns, VMMR0_DO_INTNET_IF_SET_ACTIVE,
+    int rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SET_ACTIVE,
                                      &SetActiveReq, sizeof(SetActiveReq));
 
-    Log(("drvIntNetUpdateMacAddress: fActive=%d rc=%Rrc\n", fActive, rc));
+    Log(("drvR3IntNetSetActive: fActive=%d rc=%Rrc\n", fActive, rc));
     AssertRC(rc);
     return rc;
@@ -183 +190 @@
  * @remark  This is the same as INTNETRingWriteFrame
  */
-static int drvIntNetRingWriteFrame(PINTNETBUF pBuf, PINTNETRINGBUF pRingBuf, const void *pvFrame, uint32_t cbFrame)
+static int drvR3IntNetRingWriteFrame(PINTNETBUF pBuf, PINTNETRINGBUF pRingBuf, const void *pvFrame, uint32_t cbFrame)
 {
     /*
@@ -275 +282 @@
  * @thread  EMT
  */
-static DECLCALLBACK(int) drvIntNetSend(PPDMINETWORKCONNECTOR pInterface, const void *pvBuf, size_t cb)
+static DECLCALLBACK(int) drvR3IntNetSend(PPDMINETWORKCONNECTOR pInterface, const void *pvBuf, size_t cb)
 {
     PDRVINTNET pThis = PDMINETWORKCONNECTOR_2_DRVINTNET(pInterface);
@@ -282 +289 @@
 #ifdef LOG_ENABLED
     uint64_t u64Now = RTTimeProgramNanoTS();
-    LogFlow(("drvIntNetSend: %-4d bytes at %llu ns  deltas: r=%llu t=%llu\n",
+    LogFlow(("drvR3IntNetSend: %-4d bytes at %llu ns  deltas: r=%llu t=%llu\n",
              cb, u64Now, u64Now - pThis->u64LastReceiveTS, u64Now - pThis->u64LastTransferTS));
     pThis->u64LastTransferTS = u64Now;
-    Log2(("drvIntNetSend: pvBuf=%p cb=%#x\n"
+    Log2(("drvR3IntNetSend: pvBuf=%p cb=%#x\n"
           "%.*Rhxd\n",
           pvBuf, cb, cb, pvBuf));
@@ -293 +300 @@
      * Add the frame to the send buffer and push it onto the network.
      */
-    int rc = drvIntNetRingWriteFrame(pThis->pBuf, &pThis->pBuf->Send, pvBuf, (uint32_t)cb);
+    int rc = drvR3IntNetRingWriteFrame(pThis->pBufR3, &pThis->pBufR3->Send, pvBuf, (uint32_t)cb);
     if (    rc == VERR_BUFFER_OVERFLOW
-        &&  pThis->pBuf->cbSend < cb)
+        &&  pThis->pBufR3->cbSend < cb)
     {
         INTNETIFSENDREQ SendReq;
@@ -302 +309 @@
         SendReq.pSession = NIL_RTR0PTR;
         SendReq.hIf = pThis->hIf;
-        PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvIns, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
-
-        rc = drvIntNetRingWriteFrame(pThis->pBuf, &pThis->pBuf->Send, pvBuf, (uint32_t)cb);
+        PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
+
+        rc = drvR3IntNetRingWriteFrame(pThis->pBufR3, &pThis->pBufR3->Send, pvBuf, (uint32_t)cb);
     }
 
@@ -314 +321 @@
         SendReq.pSession = NIL_RTR0PTR;
         SendReq.hIf = pThis->hIf;
-        rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvIns, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
+        rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
     }
 
@@ -333 +340 @@
  * @thread  EMT
  */
-static DECLCALLBACK(void) drvIntNetSetPromiscuousMode(PPDMINETWORKCONNECTOR pInterface, bool fPromiscuous)
+static DECLCALLBACK(void) drvR3IntNetSetPromiscuousMode(PPDMINETWORKCONNECTOR pInterface, bool fPromiscuous)
 {
     PDRVINTNET pThis = PDMINETWORKCONNECTOR_2_DRVINTNET(pInterface);
@@ -342 +349 @@
     Req.hIf             = pThis->hIf;
     Req.fPromiscuous    = fPromiscuous;
-    int rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvIns, VMMR0_DO_INTNET_IF_SET_PROMISCUOUS_MODE, &Req, sizeof(Req));
-    LogFlow(("drvIntNetSetPromiscuousMode: fPromiscuous=%RTbool\n", fPromiscuous));
+    int rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SET_PROMISCUOUS_MODE, &Req, sizeof(Req));
+    LogFlow(("drvR3IntNetSetPromiscuousMode: fPromiscuous=%RTbool\n", fPromiscuous));
     AssertRC(rc);
 }
@@ -355 +362 @@
  * @thread  EMT
  */
-static DECLCALLBACK(void) drvIntNetNotifyLinkChanged(PPDMINETWORKCONNECTOR pInterface, PDMNETWORKLINKSTATE enmLinkState)
+static DECLCALLBACK(void) drvR3IntNetNotifyLinkChanged(PPDMINETWORKCONNECTOR pInterface, PDMNETWORKLINKSTATE enmLinkState)
 {
     PDRVINTNET pThis = PDMINETWORKCONNECTOR_2_DRVINTNET(pInterface);
@@ -371 +378 @@
             break;
     }
-    LogFlow(("drvIntNetNotifyLinkChanged: enmLinkState=%d %d->%d\n", enmLinkState, pThis->fLinkDown, fLinkDown));
+    LogFlow(("drvR3IntNetNotifyLinkChanged: enmLinkState=%d %d->%d\n", enmLinkState, pThis->fLinkDown, fLinkDown));
     ASMAtomicXchgSize(&pThis->fLinkDown, fLinkDown);
 }
@@ -384 +391 @@
  * @param   pThis       Pointer to the instance data.
  */
-static int drvIntNetAsyncIoWaitForSpace(PDRVINTNET pThis)
-{
-    LogFlow(("drvIntNetAsyncIoWaitForSpace:\n"));
+static int drvR3IntNetAsyncIoWaitForSpace(PDRVINTNET pThis)
+{
+    LogFlow(("drvR3IntNetAsyncIoWaitForSpace:\n"));
     STAM_PROFILE_ADV_STOP(&pThis->StatReceive, a);
-    int rc = pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, RT_INDEFINITE_WAIT);
+    int rc = pThis->pIPortR3->pfnWaitReceiveAvail(pThis->pIPortR3, RT_INDEFINITE_WAIT);
     STAM_PROFILE_ADV_START(&pThis->StatReceive, a);
-    LogFlow(("drvIntNetAsyncIoWaitForSpace: returns %Rrc\n", rc));
+    LogFlow(("drvR3IntNetAsyncIoWaitForSpace: returns %Rrc\n", rc));
     return rc;
 }
@@ -402 +409 @@
  * @param   pThis       The driver instance data.
  */
-static int drvIntNetAsyncIoRun(PDRVINTNET pThis)
-{
-    PPDMDRVINS pDrvIns = pThis->pDrvIns;
-    LogFlow(("drvIntNetAsyncIoRun: pThis=%p\n", pThis));
+static int drvR3IntNetAsyncIoRun(PDRVINTNET pThis)
+{
+    PPDMDRVINS pDrvIns = pThis->pDrvInsR3;
+    LogFlow(("drvR3IntNetAsyncIoRun: pThis=%p\n", pThis));
 
     /*
@@ -411 +418 @@
      */
     STAM_PROFILE_ADV_START(&pThis->StatReceive, a);
-    PINTNETBUF      pBuf     = pThis->pBuf;
-    PINTNETRINGBUF  pRingBuf = &pThis->pBuf->Recv;
+    PINTNETBUF      pBuf     = pThis->pBufR3;
+    PINTNETRINGBUF  pRingBuf = &pBuf->Recv;
     for (;;)
     {
@@ -426 +433 @@
             {
                 STAM_PROFILE_ADV_STOP(&pThis->StatReceive, a);
-                LogFlow(("drvIntNetAsyncIoRun: returns VERR_STATE_CHANGED (state changed - #0)\n"));
+                LogFlow(("drvR3IntNetAsyncIoRun: returns VERR_STATE_CHANGED (state changed - #0)\n"));
                 return VERR_STATE_CHANGED;
             }
@@ -439 +446 @@
                  */
                 size_t cbFrame = pHdr->cbFrame;
-                int rc = pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0);
+                int rc = pThis->pIPortR3->pfnWaitReceiveAvail(pThis->pIPortR3, 0);
                 if (rc == VINF_SUCCESS)
                 {
 #ifdef LOG_ENABLED
                     uint64_t u64Now = RTTimeProgramNanoTS();
-                    LogFlow(("drvIntNetAsyncIoRun: %-4d bytes at %llu ns  deltas: r=%llu t=%llu\n",
+                    LogFlow(("drvR3IntNetAsyncIoRun: %-4d bytes at %llu ns  deltas: r=%llu t=%llu\n",
                              cbFrame, u64Now, u64Now - pThis->u64LastReceiveTS, u64Now - pThis->u64LastTransferTS));
                     pThis->u64LastReceiveTS = u64Now;
-                    Log2(("drvIntNetAsyncIoRun: cbFrame=%#x\n"
+                    Log2(("drvR3IntNetAsyncIoRun: cbFrame=%#x\n"
                           "%.*Rhxd\n",
                           cbFrame, cbFrame, INTNETHdrGetFramePtr(pHdr, pBuf)));
 #endif
-                    rc = pThis->pPort->pfnReceive(pThis->pPort, INTNETHdrGetFramePtr(pHdr, pBuf), cbFrame);
+                    rc = pThis->pIPortR3->pfnReceive(pThis->pIPortR3, INTNETHdrGetFramePtr(pHdr, pBuf), cbFrame);
                     AssertRC(rc);
 
@@ -462 +469 @@
                      * Wait for sufficient space to become available and then retry.
                      */
-                    rc = drvIntNetAsyncIoWaitForSpace(pThis);
+                    rc = drvR3IntNetAsyncIoWaitForSpace(pThis);
                     if (RT_FAILURE(rc))
                     {
@@ -477 +484 @@
                         {
                             STAM_PROFILE_ADV_STOP(&pThis->StatReceive, a);
-                            LogFlow(("drvIntNetAsyncIoRun: returns %Rrc (wait-for-space)\n", rc));
+                            LogFlow(("drvR3IntNetAsyncIoRun: returns %Rrc (wait-for-space)\n", rc));
                             return rc;
                         }
@@ -500 +507 @@
         {
             STAM_PROFILE_ADV_STOP(&pThis->StatReceive, a);
-            LogFlow(("drvIntNetAsyncIoRun: returns VINF_SUCCESS (state changed - #1)\n"));
+            LogFlow(("drvR3IntNetAsyncIoRun: returns VINF_SUCCESS (state changed - #1)\n"));
             return VERR_STATE_CHANGED;
         }
@@ -515 +522 @@
             &&  rc != VERR_INTERRUPTED)
         {
-            LogFlow(("drvIntNetAsyncIoRun: returns %Rrc\n", rc));
+            LogFlow(("drvR3IntNetAsyncIoRun: returns %Rrc\n", rc));
             return rc;
         }
@@ -530 +537 @@
  * @param   pvUser          Pointer to a DRVINTNET structure.
  */
-static DECLCALLBACK(int) drvIntNetAsyncIoThread(RTTHREAD ThreadSelf, void *pvUser)
+static DECLCALLBACK(int) drvR3IntNetAsyncIoThread(RTTHREAD ThreadSelf, void *pvUser)
 {
     PDRVINTNET pThis = (PDRVINTNET)pvUser;
-    LogFlow(("drvIntNetAsyncIoThread: pThis=%p\n", pThis));
+    LogFlow(("drvR3IntNetAsyncIoThread: pThis=%p\n", pThis));
     STAM_PROFILE_ADV_START(&pThis->StatReceive, a);
 
@@ -550 +557 @@
                     &&  rc != VERR_TIMEOUT)
                 {
-                    LogFlow(("drvIntNetAsyncIoThread: returns %Rrc\n", rc));
+                    LogFlow(("drvR3IntNetAsyncIoThread: returns %Rrc\n", rc));
                     return rc;
                 }
@@ -558 +565 @@
             case ASYNCSTATE_RUNNING:
             {
-                int rc = drvIntNetAsyncIoRun(pThis);
+                int rc = drvR3IntNetAsyncIoRun(pThis);
                 if (    rc != VERR_STATE_CHANGED
                     &&  RT_FAILURE(rc))
                 {
-                    LogFlow(("drvIntNetAsyncIoThread: returns %Rrc\n", rc));
+                    LogFlow(("drvR3IntNetAsyncIoThread: returns %Rrc\n", rc));
                     return rc;
                 }
@@ -571 +578 @@
                 AssertMsgFailed(("Invalid state %d\n", enmState));
             case ASYNCSTATE_TERMINATE:
-                LogFlow(("drvIntNetAsyncIoThread: returns VINF_SUCCESS\n"));
+                LogFlow(("drvR3IntNetAsyncIoThread: returns VINF_SUCCESS\n"));
                 return VINF_SUCCESS;
         }
@@ -577 +584 @@
 }
 
+/* -=-=-=-=- PDMINETWORKCONNECTOR -=-=-=-=- */
 
 /**
  * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-static DECLCALLBACK(void *) drvIntNetQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+static DECLCALLBACK(void *) drvR3IntNetQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
@@ -587 +595 @@
 
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKCONNECTOR, &pThis->INetworkConnector);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKCONNECTOR, &pThis->INetworkConnectorR3);
     return NULL;
 }
 
+/* -=-=-=-=- PDMDRVREG -=-=-=-=- */
 
 /**
@@ -597 +606 @@
  * @param   pDrvIns     The driver instance.
  */
-static DECLCALLBACK(void) drvIntNetPowerOff(PPDMDRVINS pDrvIns)
-{
-    LogFlow(("drvIntNetPowerOff\n"));
+static DECLCALLBACK(void) drvR3IntNetPowerOff(PPDMDRVINS pDrvIns)
+{
+    LogFlow(("drvR3IntNetPowerOff\n"));
     PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
     if (!pThis->fActivateEarlyDeactivateLate)
     {
         ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_SUSPENDED);
-        drvIntNetSetActive(pThis, false /* fActive */);
+        drvR3IntNetSetActive(pThis, false /* fActive */);
     }
 }
@@ -614 +623 @@
  * @param   pDrvIns     The driver instance.
  */
-static DECLCALLBACK(void) drvIntNetResume(PPDMDRVINS pDrvIns)
-{
-    LogFlow(("drvIntNetPowerResume\n"));
+static DECLCALLBACK(void) drvR3IntNetResume(PPDMDRVINS pDrvIns)
+{
+    LogFlow(("drvR3IntNetPowerResume\n"));
     PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
     if (!pThis->fActivateEarlyDeactivateLate)
@@ -622 +631 @@
         ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_RUNNING);
         RTSemEventSignal(pThis->EventSuspended);
-        drvIntNetUpdateMacAddress(pThis); /* (could be a state restore) */
-        drvIntNetSetActive(pThis, true /* fActive */);
+        drvR3IntNetUpdateMacAddress(pThis); /* (could be a state restore) */
+        drvR3IntNetSetActive(pThis, true /* fActive */);
     }
     if (   PDMDrvHlpVMTeleportedAndNotFullyResumedYet(pDrvIns)
-        && pThis->pConfigIf)
+        && pThis->pIConfigIfR3)
     {
         /*
@@ -645 +654 @@
         Frame.Hdr.DstMac.au16[2] = 0xffff;
         Frame.Hdr.EtherType      = RT_H2BE_U16(0x801e);
-        int rc = pThis->pConfigIf->pfnGetMac(pThis->pConfigIf, &Frame.Hdr.SrcMac);
+        int rc = pThis->pIConfigIfR3->pfnGetMac(pThis->pIConfigIfR3, &Frame.Hdr.SrcMac);
         if (RT_SUCCESS(rc))
-            rc = drvIntNetSend(&pThis->INetworkConnector, &Frame, sizeof(Frame));
+            rc = drvR3IntNetSend(&pThis->INetworkConnectorR3, &Frame, sizeof(Frame));
         if (RT_FAILURE(rc))
             LogRel(("IntNet#%u: Sending dummy frame failed: %Rrc\n", pDrvIns->iInstance, rc));
@@ -659 +668 @@
  * @param   pDrvIns     The driver instance.
  */
-static DECLCALLBACK(void) drvIntNetSuspend(PPDMDRVINS pDrvIns)
-{
-    LogFlow(("drvIntNetPowerSuspend\n"));
+static DECLCALLBACK(void) drvR3IntNetSuspend(PPDMDRVINS pDrvIns)
+{
+    LogFlow(("drvR3IntNetPowerSuspend\n"));
     PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
     if (!pThis->fActivateEarlyDeactivateLate)
     {
         ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_SUSPENDED);
-        drvIntNetSetActive(pThis, false /* fActive */);
+        drvR3IntNetSetActive(pThis, false /* fActive */);
     }
 }
@@ -676 +685 @@
  * @param   pDrvIns     The driver instance.
  */
-static DECLCALLBACK(void) drvIntNetPowerOn(PPDMDRVINS pDrvIns)
-{
-    LogFlow(("drvIntNetPowerOn\n"));
+static DECLCALLBACK(void) drvR3IntNetPowerOn(PPDMDRVINS pDrvIns)
+{
+    LogFlow(("drvR3IntNetPowerOn\n"));
     PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
     if (!pThis->fActivateEarlyDeactivateLate)
@@ -684 +693 @@
         ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_RUNNING);
         RTSemEventSignal(pThis->EventSuspended);
-        drvIntNetUpdateMacAddress(pThis);
-        drvIntNetSetActive(pThis, true /* fActive */);
+        drvR3IntNetUpdateMacAddress(pThis);
+        drvR3IntNetSetActive(pThis, true /* fActive */);
     }
 }
@@ -698 +707 @@
  * @param   pDrvIns     The driver instance data.
  */
-static DECLCALLBACK(void) drvIntNetDestruct(PPDMDRVINS pDrvIns)
-{
-    LogFlow(("drvIntNetDestruct\n"));
+static DECLCALLBACK(void) drvR3IntNetDestruct(PPDMDRVINS pDrvIns)
+{
+    LogFlow(("drvR3IntNetDestruct\n"));
     PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
 
@@ -747 +756 @@
      * Deregister statistics in case we're being detached.
      */
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cbStatRecv);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cbStatSend);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cStatRecvs);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cStatSends);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cStatLost);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cStatYieldsNok);
+    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBufR3->cbStatRecv);
+    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBufR3->cbStatSend);
+    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBufR3->cStatRecvs);
+    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBufR3->cStatSends);
+    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBufR3->cStatLost);
+    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBufR3->cStatYieldsNok);
 #ifdef VBOX_WITH_STATISTICS
     PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatReceive);
@@ -765 +774 @@
  * @copydoc FNPDMDRVCONSTRUCT
  */
-static DECLCALLBACK(int) drvIntNetConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
+static DECLCALLBACK(int) drvR3IntNetConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
 {
     PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
@@ -773 +782 @@
      * Init the static parts.
      */
-    pThis->pDrvIns                      = pDrvIns;
-    pThis->hIf                          = INTNET_HANDLE_INVALID;
-    pThis->Thread                       = NIL_RTTHREAD;
-    pThis->EventSuspended               = NIL_RTSEMEVENT;
-    pThis->enmState                     = ASYNCSTATE_SUSPENDED;
-    pThis->fActivateEarlyDeactivateLate = false;
+    pThis->pDrvInsR3                                = pDrvIns;
+    pThis->hIf                                      = INTNET_HANDLE_INVALID;
+    pThis->Thread                                   = NIL_RTTHREAD;
+    pThis->EventSuspended                           = NIL_RTSEMEVENT;
+    pThis->enmState                                 = ASYNCSTATE_SUSPENDED;
+    pThis->fActivateEarlyDeactivateLate             = false;
     /* IBase */
-    pDrvIns->IBase.pfnQueryInterface    = drvIntNetQueryInterface;
+    pDrvIns->IBase.pfnQueryInterface                = drvR3IntNetQueryInterface;
     /* INetwork */
-    pThis->INetworkConnector.pfnSend                = drvIntNetSend;
-    pThis->INetworkConnector.pfnSetPromiscuousMode  = drvIntNetSetPromiscuousMode;
-    pThis->INetworkConnector.pfnNotifyLinkChanged   = drvIntNetNotifyLinkChanged;
+    pThis->INetworkConnectorR3.pfnSend              = drvR3IntNetSend;
+    pThis->INetworkConnectorR3.pfnSetPromiscuousMode= drvR3IntNetSetPromiscuousMode;
+    pThis->INetworkConnectorR3.pfnNotifyLinkChanged = drvR3IntNetNotifyLinkChanged;
 
     /*
@@ -818 +827 @@
      * Query the network port interface.
      */
-    pThis->pPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMINETWORKPORT);
-    if (!pThis->pPort)
+    pThis->pIPortR3 = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMINETWORKPORT);
+    if (!pThis->pIPortR3)
     {
         AssertMsgFailed(("Configuration error: the above device/driver didn't export the network port interface!\n"));
         return VERR_PDM_MISSING_INTERFACE_ABOVE;
     }
-    pThis->pConfigIf = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMINETWORKCONFIG);
+    pThis->pIConfigIfR3 = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMINETWORKCONFIG);
 
     /*
@@ -1081 +1090 @@
                                    N_("Failed to get ring-3 buffer for the newly created interface to '%s'"), pThis->szNetwork);
     AssertRelease(VALID_PTR(GetRing3BufferReq.pRing3Buf));
-    pThis->pBuf = GetRing3BufferReq.pRing3Buf;
+    pThis->pBufR3 = GetRing3BufferReq.pRing3Buf;
 
     /*
@@ -1087 +1096 @@
      * Note! Using a PDM thread here doesn't fit with the IsService=true operation.
      */
-    rc = RTThreadCreate(&pThis->Thread, drvIntNetAsyncIoThread, pThis, _128K, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "INTNET");
+    rc = RTThreadCreate(&pThis->Thread, drvR3IntNetAsyncIoThread, pThis, _128K, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "INTNET");
     if (RT_FAILURE(rc))
     {
@@ -1094 +1103 @@
     }
 
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->pBuf->cbStatRecv,       STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS,  STAMUNIT_BYTES, "Number of received bytes.",    "/Net/IntNet%d/Bytes/Received", pDrvIns->iInstance);
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->pBuf->cbStatSend,       STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS,  STAMUNIT_BYTES, "Number of sent bytes.",        "/Net/IntNet%d/Bytes/Sent", pDrvIns->iInstance);
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->pBuf->cStatRecvs,       STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS,  STAMUNIT_COUNT, "Number of received packets.",  "/Net/IntNet%d/Packets/Received", pDrvIns->iInstance);
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->pBuf->cStatSends,       STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS,  STAMUNIT_COUNT, "Number of sent packets.",      "/Net/IntNet%d/Packets/Sent", pDrvIns->iInstance);
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->pBuf->cStatLost,        STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS,  STAMUNIT_COUNT, "Number of sent packets.",      "/Net/IntNet%d/Packets/Lost", pDrvIns->iInstance);
-    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->pBuf->cStatYieldsNok,   STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS,  STAMUNIT_COUNT, "Number of times yielding didn't help fix an overflow.",  "/Net/IntNet%d/YieldNok", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->pBufR3->cbStatRecv,     STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS,  STAMUNIT_BYTES, "Number of received bytes.",    "/Net/IntNet%d/Bytes/Received", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->pBufR3->cbStatSend,     STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS,  STAMUNIT_BYTES, "Number of sent bytes.",        "/Net/IntNet%d/Bytes/Sent", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->pBufR3->cStatRecvs,     STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS,  STAMUNIT_COUNT, "Number of received packets.",  "/Net/IntNet%d/Packets/Received", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->pBufR3->cStatSends,     STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS,  STAMUNIT_COUNT, "Number of sent packets.",      "/Net/IntNet%d/Packets/Sent", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->pBufR3->cStatLost,      STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS,  STAMUNIT_COUNT, "Number of sent packets.",      "/Net/IntNet%d/Packets/Lost", pDrvIns->iInstance);
+    PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->pBufR3->cStatYieldsNok, STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS,  STAMUNIT_COUNT, "Number of times yielding didn't help fix an overflow.",  "/Net/IntNet%d/YieldNok", pDrvIns->iInstance);
 #ifdef VBOX_WITH_STATISTICS
     PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->StatReceive,            STAMTYPE_PROFILE,   STAMVISIBILITY_ALWAYS,  STAMUNIT_TICKS_PER_CALL, "Profiling packet receive runs.",  "/Net/IntNet%d/Receive", pDrvIns->iInstance);
@@ -1112 +1121 @@
         ASMAtomicXchgSize(&pThis->enmState, ASYNCSTATE_RUNNING);
         RTSemEventSignal(pThis->EventSuspended);
-        drvIntNetUpdateMacAddress(pThis);
-        drvIntNetSetActive(pThis, true /* fActive */);
+        drvR3IntNetUpdateMacAddress(pThis);
+        drvR3IntNetSetActive(pThis, true /* fActive */);
     }
 
@@ -1130 +1139 @@
     "IntNet",
     /* szRCMod */
-    "",
+    "VBoxDD",
     /* szR0Mod */
-    "",
+    "VBoxDD",
     /* pszDescription */
     "Internal Networking Transport Driver",
     /* fFlags */
+#ifdef VBOX_WITH_R0_AND_RC_DRIVERS
+    PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT | PDM_DRVREG_FLAGS_R0 | PDM_DRVREG_FLAGS_RC,
+#else
     PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT,
+#endif
     /* fClass. */
     PDM_DRVREG_CLASS_NETWORK,
@@ -1144 +1157 @@
     sizeof(DRVINTNET),
     /* pfnConstruct */
-    drvIntNetConstruct,
+    drvR3IntNetConstruct,
     /* pfnDestruct */
-    drvIntNetDestruct,
+    drvR3IntNetDestruct,
     /* pfnRelocate */
     NULL,
@@ -1152 +1165 @@
     NULL,
     /* pfnPowerOn */
-    drvIntNetPowerOn,
+    drvR3IntNetPowerOn,
     /* pfnReset */
     NULL,
     /* pfnSuspend */
-    drvIntNetSuspend,
+    drvR3IntNetSuspend,
     /* pfnResume */
-    drvIntNetResume,
+    drvR3IntNetResume,
     /* pfnAttach */
     NULL,
@@ -1164 +1177 @@
     NULL,
     /* pfnPowerOff */
-    drvIntNetPowerOff,
+    drvR3IntNetPowerOff,
     /* pfnSoftReset */
     NULL,
@@ -1171 +1184 @@
 };
 
+#endif /* IN_RING3 */
+