Changeset 44541 in vbox

Timestamp:

Feb 5, 2013 1:06:13 PM (12 years ago)

Author:

vboxsync

Message:

DevE1000.cpp: Some more cleanups.

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (137 diffs)

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

@@ -187 +187 @@
 //#undef DEBUG
 
-#define INSTANCE(pState) pState->szInstance
 #define STATE_TO_DEVINS(pState)           (((E1KSTATE *)pState)->CTX_SUFF(pDevIns))
 #define E1K_RELOCATE(p, o) *(RTHCUINTPTR *)&p += o
@@ -1003 +1002 @@
 struct E1kState_st
 {
-    char                    szInstance[8];        /**< Instance name, e.g. E1000#1. */
+    char                    szPrf[8];                /**< Log prefix, e.g. E1000#1. */
     PDMIBASE                IBase;
     PDMINETWORKDOWN         INetworkDown;
@@ -1540 +1539 @@
 
     E1kLog2(("%s Arming %s timer to fire in %d usec...\n",
-             INSTANCE(pState), e1kGetTimerName(pState, pTimer), uExpireIn));
+             pState->szPrf, e1kGetTimerName(pState, pTimer), uExpireIn));
     TMTimerSetMicro(pTimer, uExpireIn);
 }
@@ -1553 +1552 @@
 {
     E1kLog2(("%s Stopping %s timer...\n",
-            INSTANCE(pState), e1kGetTimerName(pState, pTimer)));
+            pState->szPrf, e1kGetTimerName(pState, pTimer)));
     int rc = TMTimerStop(pTimer);
     if (RT_FAILURE(rc))
     {
         E1kLog2(("%s e1kCancelTimer: TMTimerStop() failed with %Rrc\n",
-                INSTANCE(pState), rc));
+                pState->szPrf, rc));
     }
 }
@@ -1589 +1588 @@
     {
         STAM_COUNTER_INC(&pState->StatRxOverflowWakeup);
-        E1kLog(("%s Waking up Out-of-RX-space semaphore\n",  INSTANCE(pState)));
+        E1kLog(("%s Waking up Out-of-RX-space semaphore\n",  pState->szPrf));
         RTSemEventSignal(pState->hEventMoreRxDescAvail);
     }
@@ -1601 +1600 @@
 static void e1kHardReset(E1KSTATE *pState)
 {
-    E1kLog(("%s Hard reset triggered\n", INSTANCE(pState)));
+    E1kLog(("%s Hard reset triggered\n", pState->szPrf));
     memset(pState->auRegs,        0, sizeof(pState->auRegs));
     memset(pState->aRecAddr.au32, 0, sizeof(pState->aRecAddr.au32));
@@ -1688 +1687 @@
     {
         E1kLog(("%s --- %s packet #%d: ---\n",
-                INSTANCE(pState), cszText, ++pState->u32PktNo));
+                pState->szPrf, cszText, ++pState->u32PktNo));
         E1kLog3(("%.*Rhxd\n", cb, cpPacket));
         e1kCsLeave(pState);
@@ -1725 +1724 @@
 static void e1kPrintRDesc(E1KSTATE* pState, E1KRXDESC* pDesc)
 {
-    E1kLog2(("%s <-- Receive Descriptor (%d bytes):\n", INSTANCE(pState), pDesc->u16Length));
+    E1kLog2(("%s <-- Receive Descriptor (%d bytes):\n", pState->szPrf, pDesc->u16Length));
     E1kLog2(("        Address=%16LX Length=%04X Csum=%04X\n",
              pDesc->u64BufAddr, pDesc->u16Length, pDesc->u16Checksum));
@@ -1764 +1763 @@
         case E1K_DTYP_CONTEXT:
             E1kLogX(uLevel, ("%s %s Context Transmit Descriptor %s\n",
-                    INSTANCE(pState), cszDir, cszDir));
+                    pState->szPrf, cszDir, cszDir));
             E1kLogX(uLevel, ("        IPCSS=%02X IPCSO=%02X IPCSE=%04X TUCSS=%02X TUCSO=%02X TUCSE=%04X\n",
                     pDesc->context.ip.u8CSS, pDesc->context.ip.u8CSO, pDesc->context.ip.u16CSE,
@@ -1781 +1780 @@
         case E1K_DTYP_DATA:
             E1kLogX(uLevel, ("%s %s Data Transmit Descriptor (%d bytes) %s\n",
-                    INSTANCE(pState), cszDir, pDesc->data.cmd.u20DTALEN, cszDir));
+                    pState->szPrf, cszDir, pDesc->data.cmd.u20DTALEN, cszDir));
             E1kLogX(uLevel, ("        Address=%16LX DTALEN=%05X\n",
                     pDesc->data.u64BufAddr,
@@ -1804 +1803 @@
         case E1K_DTYP_LEGACY:
             E1kLogX(uLevel, ("%s %s Legacy Transmit Descriptor (%d bytes) %s\n",
-                    INSTANCE(pState), cszDir, pDesc->legacy.cmd.u16Length, cszDir));
+                    pState->szPrf, cszDir, pDesc->legacy.cmd.u16Length, cszDir));
             E1kLogX(uLevel, ("        Address=%16LX DTALEN=%05X\n",
                     pDesc->data.u64BufAddr,
@@ -1827 +1826 @@
         default:
             E1kLog(("%s %s Invalid Transmit Descriptor %s\n",
-                    INSTANCE(pState), cszDir, cszDir));
+                    pState->szPrf, cszDir, cszDir));
             break;
     }
@@ -1853 +1852 @@
             pState->iStatIntLostOne = 1;
             E1kLog2(("%s e1kRaiseInterrupt: Delayed. ICR=%08x\n",
-                    INSTANCE(pState), ICR));
+                    pState->szPrf, ICR));
 #define E1K_LOST_IRQ_THRSLD 20
 //#define E1K_LOST_IRQ_THRSLD 200000000
@@ -1859 +1858 @@
             {
                 E1kLog2(("%s WARNING! Disabling delayed interrupt logic: delayed=%d, delivered=%d\n",
-                        INSTANCE(pState), pState->uStatIntDly, pState->uStatIntLate));
+                        pState->szPrf, pState->uStatIntDly, pState->uStatIntLate));
                 pState->fIntMaskUsed = false;
                 pState->uStatDisDly++;
@@ -1870 +1869 @@
             E1K_INC_ISTAT_CNT(pState->uStatIntSkip);
             E1kLog2(("%s e1kRaiseInterrupt: Already raised, skipped. ICR&IMS=%08x\n",
-                    INSTANCE(pState), ICR & IMS));
+                    pState->szPrf, ICR & IMS));
         }
         else
@@ -1878 +1877 @@
             /* interrupts/sec = 1 / (256 * 10E-9 * ITR) */
             E1kLog2(("%s e1kRaiseInterrupt: tstamp - pState->u64AckedAt = %d, ITR * 256 = %d\n",
-                        INSTANCE(pState), (uint32_t)(tstamp - pState->u64AckedAt), ITR * 256));
+                        pState->szPrf, (uint32_t)(tstamp - pState->u64AckedAt), ITR * 256));
             //if (!!ITR && pState->fIntMaskUsed && tstamp - pState->u64AckedAt < ITR * 256)
             if (!!ITR && tstamp - pState->u64AckedAt < ITR * 256 && !(ICR & ICR_RXT0))
@@ -1884 +1883 @@
                 E1K_INC_ISTAT_CNT(pState->uStatIntEarly);
                 E1kLog2(("%s e1kRaiseInterrupt: Too early to raise again: %d ns < %d ns.\n",
-                        INSTANCE(pState), (uint32_t)(tstamp - pState->u64AckedAt), ITR * 256));
+                        pState->szPrf, (uint32_t)(tstamp - pState->u64AckedAt), ITR * 256));
             }
             else
@@ -1902 +1901 @@
                 PDMDevHlpPCISetIrq(pState->CTX_SUFF(pDevIns), 0, 1);
                 E1kLog(("%s e1kRaiseInterrupt: Raised. ICR&IMS=%08x\n",
-                        INSTANCE(pState), ICR & IMS));
+                        pState->szPrf, ICR & IMS));
             }
         }
@@ -1910 +1909 @@
         E1K_INC_ISTAT_CNT(pState->uStatIntMasked);
         E1kLog2(("%s e1kRaiseInterrupt: Not raising, ICR=%08x, IMS=%08x\n",
-                INSTANCE(pState), ICR, IMS));
+                pState->szPrf, ICR, IMS));
     }
     e1kCsLeave(pState);
@@ -1961 +1960 @@
         E1kLogRel(("E1000: low on RX descriptors, RDH=%x RDT=%x len=%x threshold=%x\n", RDH, RDT, uRQueueLen, uMinRQThreshold));
         E1kLog2(("%s Low on RX descriptors, RDH=%x RDT=%x len=%x threshold=%x, raise an interrupt\n",
-                 INSTANCE(pState), RDH, RDT, uRQueueLen, uMinRQThreshold));
+                 pState->szPrf, RDH, RDT, uRQueueLen, uMinRQThreshold));
         E1K_INC_ISTAT_CNT(pState->uStatIntRXDMT0);
         e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_RXDMT0);
     }
     E1kLog2(("%s e1kAdvanceRDH: at exit RDH=%x RDT=%x len=%x\n",
-             INSTANCE(pState), RDH, RDT, uRQueueLen));
+             pState->szPrf, RDH, RDT, uRQueueLen));
     //e1kCsLeave(pState);
 }
@@ -2025 +2024 @@
     E1kLog3(("%s e1kRxDPrefetch: nDescsAvailable=%u nDescsToFetch=%u "
              "nDescsTotal=%u nFirstNotLoaded=0x%x nDescsInSingleRead=%u\n",
-             INSTANCE(pState), nDescsAvailable, nDescsToFetch, nDescsTotal,
+             pState->szPrf, nDescsAvailable, nDescsToFetch, nDescsTotal,
              nFirstNotLoaded, nDescsInSingleRead));
     if (nDescsToFetch == 0)
@@ -2038 +2037 @@
     // {
     //     pState->aRxDescAddr[i] = addrBase + (nFirstNotLoaded + i - pState->nRxDFetched) * sizeof(E1KRXDESC);
-    //     E1kLog3(("%s aRxDescAddr[%d] = %p\n", INSTANCE(pState), i, pState->aRxDescAddr[i]));
+    //     E1kLog3(("%s aRxDescAddr[%d] = %p\n", pState->szPrf, i, pState->aRxDescAddr[i]));
     // }
     E1kLog3(("%s Fetched %u RX descriptors at %08x%08x(0x%x), RDLEN=%08x, RDH=%08x, RDT=%08x\n",
-             INSTANCE(pState), nDescsInSingleRead,
+             pState->szPrf, nDescsInSingleRead,
              RDBAH, RDBAL + RDH * sizeof(E1KRXDESC),
              nFirstNotLoaded, RDLEN, RDH, RDT));
@@ -2054 +2053 @@
         // {
         //     pState->aRxDescAddr[i] = addrBase + j * sizeof(E1KRXDESC);
-        //     E1kLog3(("%s aRxDescAddr[%d] = %p\n", INSTANCE(pState), i, pState->aRxDescAddr[i]));
+        //     E1kLog3(("%s aRxDescAddr[%d] = %p\n", pState->szPrf, i, pState->aRxDescAddr[i]));
         // }
         E1kLog3(("%s Fetched %u RX descriptors at %08x%08x\n",
-                 INSTANCE(pState), nDescsToFetch - nDescsInSingleRead,
+                 pState->szPrf, nDescsToFetch - nDescsInSingleRead,
                  RDBAH, RDBAL));
     }
@@ -2125 +2124 @@
     STAM_PROFILE_ADV_START(&pState->StatReceiveStore, a);
     E1kLog2(("%s e1kStoreRxFragment: store fragment of %04X at %016LX, EOP=%d\n",
-             INSTANCE(pState), cb, pDesc->u64BufAddr, pDesc->status.fEOP));
+             pState->szPrf, cb, pDesc->u64BufAddr, pDesc->status.fEOP));
     PDMDevHlpPhysWrite(pState->CTX_SUFF(pDevIns), pDesc->u64BufAddr, pvBuf, cb);
     pDesc->u16Length = (uint16_t)cb;                        Assert(pDesc->u16Length == cb);
@@ -2147 +2146 @@
 {
     STAM_PROFILE_ADV_START(&pState->StatReceiveStore, a);
-    E1kLog2(("%s e1kStoreRxFragment: store fragment of %04X at %016LX, EOP=%d\n", pState->szInstance, cb, pDesc->u64BufAddr, pDesc->status.fEOP));
+    E1kLog2(("%s e1kStoreRxFragment: store fragment of %04X at %016LX, EOP=%d\n", pState->szPrf, cb, pDesc->u64BufAddr, pDesc->status.fEOP));
     PDMDevHlpPhysWrite(pState->CTX_SUFF(pDevIns), pDesc->u64BufAddr, pvBuf, cb);
     pDesc->u16Length = (uint16_t)cb;                        Assert(pDesc->u16Length == cb);
@@ -2156 +2155 @@
     /* Advance head */
     e1kAdvanceRDH(pState);
-    //E1kLog2(("%s e1kStoreRxFragment: EOP=%d RDTR=%08X RADV=%08X\n", INSTANCE(pState), pDesc->fEOP, RDTR, RADV));
+    //E1kLog2(("%s e1kStoreRxFragment: EOP=%d RDTR=%08X RADV=%08X\n", pState->szPrf, pDesc->fEOP, RDTR, RADV));
     if (pDesc->status.fEOP)
     {
@@ -2229 +2228 @@
     uint16_t uEtherType = ntohs(*(uint16_t*)(pFrame + 12));
 
-    E1kLog2(("%s e1kRxChecksumOffload: EtherType=%x\n", INSTANCE(pState), uEtherType));
+    E1kLog2(("%s e1kRxChecksumOffload: EtherType=%x\n", pState->szPrf, uEtherType));
 
     switch (uEtherType)
@@ -2285 +2284 @@
     Assert(cb > 16);
     size_t cbMax = ((RCTL & RCTL_LPE) ? E1K_MAX_RX_PKT_SIZE - 4 : 1518) - (status.fVP ? 0 : 4);
-    E1kLog3(("%s Max RX packet size is %u\n", INSTANCE(pState), cbMax));
+    E1kLog3(("%s Max RX packet size is %u\n", pState->szPrf, cbMax));
     if (status.fVP)
     {
@@ -2297 +2296 @@
             cb -= 4;
             E1kLog3(("%s Stripped tag for VLAN %u (cb=%u)\n",
-                     INSTANCE(pState), status.u16Special, cb));
+                     pState->szPrf, status.u16Special, cb));
         }
         else
@@ -2322 +2321 @@
         cb += sizeof(uint32_t);
         STAM_PROFILE_ADV_STOP(&pState->StatReceiveCRC, a);
-        E1kLog3(("%s Added FCS (cb=%u)\n", INSTANCE(pState), cb));
+        E1kLog3(("%s Added FCS (cb=%u)\n", pState->szPrf, cb));
     }
     /* Compute checksum of complete packet */
@@ -2361 +2360 @@
             E1kLog(("%s Out of receive buffers, dropping the packet "
                     "(cb=%u, in_cache=%u, RDH=%x RDT=%x)\n",
-                    INSTANCE(pState), cb, e1kRxDInCache(pState), RDH, RDT));
+                    pState->szPrf, cb, e1kRxDInCache(pState), RDH, RDT));
             break;
         }
@@ -2368 +2367 @@
     {
         E1kLog(("%s Out of receive buffers, dropping the packet\n",
-                INSTANCE(pState)));
+                pState->szPrf));
     }
     /* Store the packet to receive buffers */
@@ -2437 +2436 @@
 
     if (cb > 0)
-        E1kLog(("%s Out of receive buffers, dropping %u bytes", INSTANCE(pState), cb));
+        E1kLog(("%s Out of receive buffers, dropping %u bytes", pState->szPrf, cb));
 
     pState->led.Actual.s.fReading = 0;
@@ -2480 +2479 @@
 {
     E1kLog(("%s Will bring up the link in %d seconds...\n",
-            INSTANCE(pState), pState->cMsLinkUpDelay / 1000));
+            pState->szPrf, pState->cMsLinkUpDelay / 1000));
     e1kArmTimer(pState, pState->CTX_SUFF(pLUTimer), pState->cMsLinkUpDelay * 1000);
 }
@@ -2500 +2499 @@
 {
     E1kLog(("%s e1kRegReadCTRL: mdio dir=%s mdc dir=%s mdc=%d\n",
-            INSTANCE(pState), (CTRL & CTRL_MDIO_DIR)?"OUT":"IN ",
+            pState->szPrf, (CTRL & CTRL_MDIO_DIR)?"OUT":"IN ",
             (CTRL & CTRL_MDC_DIR)?"OUT":"IN ", !!(CTRL & CTRL_MDC)));
     if ((CTRL & CTRL_MDIO_DIR) == 0 && (CTRL & CTRL_MDC))
@@ -2510 +2509 @@
             *pu32Value = CTRL & ~CTRL_MDIO;
         E1kLog(("%s e1kRegReadCTRL: Phy::readMDIO(%d)\n",
-                INSTANCE(pState), !!(*pu32Value & CTRL_MDIO)));
+                pState->szPrf, !!(*pu32Value & CTRL_MDIO)));
     }
     else
@@ -2562 +2561 @@
         if (value & CTRL_VME)
         {
-            E1kLog(("%s VLAN Mode Enabled\n", INSTANCE(pState)));
+            E1kLog(("%s VLAN Mode Enabled\n", pState->szPrf));
         }
         E1kLog(("%s e1kRegWriteCTRL: mdio dir=%s mdc dir=%s mdc=%s mdio=%d\n",
-                INSTANCE(pState), (value & CTRL_MDIO_DIR)?"OUT":"IN ",
+                pState->szPrf, (value & CTRL_MDIO_DIR)?"OUT":"IN ",
                 (value & CTRL_MDC_DIR)?"OUT":"IN ", (value & CTRL_MDC)?"HIGH":"LOW ", !!(value & CTRL_MDIO)));
         if (value & CTRL_MDC)
@@ -2571 +2570 @@
             if (value & CTRL_MDIO_DIR)
             {
-                E1kLog(("%s e1kRegWriteCTRL: Phy::writeMDIO(%d)\n", INSTANCE(pState), !!(value & CTRL_MDIO)));
+                E1kLog(("%s e1kRegWriteCTRL: Phy::writeMDIO(%d)\n", pState->szPrf, !!(value & CTRL_MDIO)));
                 /* MDIO direction pin is set to output and MDC is high, write MDIO pin value to PHY */
                 Phy::writeMDIO(&pState->phy, !!(value & CTRL_MDIO));
@@ -2582 +2581 @@
                     value &= ~CTRL_MDIO;
                 E1kLog(("%s e1kRegWriteCTRL: Phy::readMDIO(%d)\n",
-                        INSTANCE(pState), !!(value & CTRL_MDIO)));
+                        pState->szPrf, !!(value & CTRL_MDIO)));
             }
         }
@@ -2717 +2716 @@
     {
         E1kLog(("%s ERROR! Interrupt at the end of an MDI cycle is not supported yet.\n",
-                INSTANCE(pState)));
+                pState->szPrf));
     }
     else if (value & MDIC_READY)
     {
         E1kLog(("%s ERROR! Ready bit is not reset by software during write operation.\n",
-                INSTANCE(pState)));
+                pState->szPrf));
     }
     else if (GET_BITS_V(value, MDIC, PHY) != 1)
     {
         E1kLog(("%s ERROR! Access to invalid PHY detected, phy=%d.\n",
-                INSTANCE(pState), GET_BITS_V(value, MDIC, PHY)));
+                pState->szPrf, GET_BITS_V(value, MDIC, PHY)));
     }
     else
@@ -2802 +2801 @@
                  */
                 E1kLogRel(("E1000: irq lowered, icr=0x%x\n", ICR));
-                E1kLog(("%s e1kRegReadICR: Lowered IRQ (%08x)\n", INSTANCE(pState), ICR));
+                E1kLog(("%s e1kRegReadICR: Lowered IRQ (%08x)\n", pState->szPrf, ICR));
                 /* Clear all pending interrupts */
                 ICR = 0;
@@ -2819 +2818 @@
                  * just before re-enabling interrupts
                  */
-                E1kLog(("%s e1kRegReadICR: Suppressing auto-clear due to disabled interrupts (%08x)\n", INSTANCE(pState), ICR));
+                E1kLog(("%s e1kRegReadICR: Suppressing auto-clear due to disabled interrupts (%08x)\n", pState->szPrf, ICR));
             }
         }
@@ -2863 +2862 @@
     IMS |= value;
     E1kLogRel(("E1000: irq enabled, RDH=%x RDT=%x TDH=%x TDT=%x\n", RDH, RDT, TDH, TDT));
-    E1kLog(("%s e1kRegWriteIMS: IRQ enabled\n", INSTANCE(pState)));
+    E1kLog(("%s e1kRegWriteIMS: IRQ enabled\n", pState->szPrf));
     /* Mask changes, we need to raise pending interrupts. */
     if ((ICR & IMS) && !pState->fLocked)
     {
         E1kLog2(("%s e1kRegWriteIMS: IRQ pending (%08x), arming late int timer...\n",
-                 INSTANCE(pState), ICR));
+                 pState->szPrf, ICR));
         /* Raising an interrupt immediately causes win7 to hang upon NIC reconfiguration, see @bugref{5023}. */
         TMTimerSet(pState->CTX_SUFF(pIntTimer), TMTimerFromNano(pState->CTX_SUFF(pIntTimer), ITR * 256) +
@@ -2907 +2906 @@
         PDMDevHlpPCISetIrq(pState->CTX_SUFF(pDevIns), 0, 0);
         pState->fIntRaised = false;
-        E1kLog(("%s e1kRegWriteIMC: Lowered IRQ: ICR=%08x\n", INSTANCE(pState), ICR));
+        E1kLog(("%s e1kRegWriteIMC: Lowered IRQ: ICR=%08x\n", pState->szPrf, ICR));
     }
     IMS &= ~value;
-    E1kLog(("%s e1kRegWriteIMC: IRQ disabled\n", INSTANCE(pState)));
+    E1kLog(("%s e1kRegWriteIMC: IRQ disabled\n", pState->szPrf));
     e1kCsLeave(pState);
 
@@ -2947 +2946 @@
     if (cbRxBuf != pState->u16RxBSize)
         E1kLog2(("%s e1kRegWriteRCTL: Setting receive buffer size to %d (old %d)\n",
-                 INSTANCE(pState), cbRxBuf, pState->u16RxBSize));
+                 pState->szPrf, cbRxBuf, pState->u16RxBSize));
     pState->u16RxBSize = cbRxBuf;
 
@@ -3000 +2999 @@
     if (RT_LIKELY(rc == VINF_SUCCESS))
     {
-        E1kLog(("%s e1kRegWriteRDT\n",  INSTANCE(pState)));
+        E1kLog(("%s e1kRegWriteRDT\n",  pState->szPrf));
         rc = e1kRegWriteDefault(pState, offset, index, value);
 #ifdef E1K_WITH_RXD_CACHE
@@ -3244 +3243 @@
         return;
 
-    E1kLog(("%s e1kLinkUpTimer: Link is up\n", INSTANCE(pState)));
+    E1kLog(("%s e1kLinkUpTimer: Link is up\n", pState->szPrf));
     STATUS |= STATUS_LU;
     Phy::setLinkStatus(&pState->phy, true);
@@ -3550 +3549 @@
         }
         E1kLog3(("%s Allocated buffer for TX packet: cb=%u %s%s\n",
-                 INSTANCE(pState), pState->cbTxAlloc,
+                 pState->szPrf, pState->cbTxAlloc,
                  pState->fVTag ? "VLAN " : "",
                  pState->fGSO ? "GSO " : ""));
@@ -3629 +3628 @@
     E1kLog3(("%s e1kTxDLoadMore: nDescsAvailable=%u nDescsToFetch=%u "
              "nDescsTotal=%u nFirstNotLoaded=0x%x nDescsInSingleRead=%u\n",
-             INSTANCE(pState), nDescsAvailable, nDescsToFetch, nDescsTotal,
+             pState->szPrf, nDescsAvailable, nDescsToFetch, nDescsTotal,
              nFirstNotLoaded, nDescsInSingleRead));
     if (nDescsToFetch == 0)
@@ -3638 +3637 @@
                       pFirstEmptyDesc, nDescsInSingleRead * sizeof(E1KTXDESC));
     E1kLog3(("%s Fetched %u TX descriptors at %08x%08x(0x%x), TDLEN=%08x, TDH=%08x, TDT=%08x\n",
-             INSTANCE(pState), nDescsInSingleRead,
+             pState->szPrf, nDescsInSingleRead,
              TDBAH, TDBAL + TDH * sizeof(E1KTXDESC),
              nFirstNotLoaded, TDLEN, TDH, TDT));
@@ -3648 +3647 @@
                           (nDescsToFetch - nDescsInSingleRead) * sizeof(E1KTXDESC));
         E1kLog3(("%s Fetched %u TX descriptors at %08x%08x\n",
-                 INSTANCE(pState), nDescsToFetch - nDescsInSingleRead,
+                 pState->szPrf, nDescsToFetch - nDescsInSingleRead,
                  TDBAH, TDBAL));
     }
@@ -3732 +3731 @@
     {
         E1kLog3(("%s Inserting VLAN tag %08x\n",
-            INSTANCE(pState), RT_BE2H_U16(VET) | (RT_BE2H_U16(pState->u16VTagTCI) << 16)));
+            pState->szPrf, RT_BE2H_U16(VET) | (RT_BE2H_U16(pState->u16VTagTCI) << 16)));
         memmove((uint8_t*)pSg->aSegs[0].pvSeg + 16, (uint8_t*)pSg->aSegs[0].pvSeg + 12, cbFrame - 12);
         *((uint32_t*)pSg->aSegs[0].pvSeg + 3) = RT_BE2H_U16(VET) | (RT_BE2H_U16(pState->u16VTagTCI) << 16);
@@ -3743 +3742 @@
             "%.*Rhxd\n"
             "%s < < < < < < < < < < < < <  End of dump > > > > > > > > > > > >\n",
-            INSTANCE(pState), cbFrame, pSg->aSegs[0].pvSeg, INSTANCE(pState)));*/
+            pState->szPrf, cbFrame, pSg->aSegs[0].pvSeg, pState->szPrf));*/
 
     /* Update the stats */
@@ -3837 +3836 @@
     {
         E1kLog2(("%s css(%X) is greater than packet length-1(%X), checksum is not inserted\n",
-                 INSTANCE(pState), cso, u16PktLen));
+                 pState->szPrf, cso, u16PktLen));
         return;
     }
@@ -3844 +3843 @@
     {
         E1kLog2(("%s cso(%X) is greater than packet length-2(%X), checksum is not inserted\n",
-                 INSTANCE(pState), cso, u16PktLen));
+                 pState->szPrf, cso, u16PktLen));
         return;
     }
@@ -3851 +3850 @@
         cse = u16PktLen - 1;
     uint16_t u16ChkSum = e1kCSum16(pPkt + css, cse - css + 1);
-    E1kLog2(("%s Inserting csum: %04X at %02X, old value: %04X\n", INSTANCE(pState),
+    E1kLog2(("%s Inserting csum: %04X at %02X, old value: %04X\n", pState->szPrf,
              u16ChkSum, cso, *(uint16_t*)(pPkt + cso)));
     *(uint16_t*)(pPkt + cso) = u16ChkSum;
@@ -3881 +3880 @@
 
     E1kLog3(("%s e1kFallbackAddSegment: Length=%x, remaining payload=%x, header=%x, send=%RTbool\n",
-             INSTANCE(pState), u16Len, pState->u32PayRemain, pState->u16HdrRemain, fSend));
+             pState->szPrf, u16Len, pState->u32PayRemain, pState->u16HdrRemain, fSend));
     Assert(pState->u32PayRemain + pState->u16HdrRemain > 0);
 
@@ -3889 +3888 @@
             "%.*Rhxd\n"
             "%s --- End of dump ---\n",
-            INSTANCE(pState), u16Len, pState->aTxPacketFallback + pState->u16TxPktLen, INSTANCE(pState)));
+            pState->szPrf, u16Len, pState->aTxPacketFallback + pState->u16TxPktLen, pState->szPrf));
     pState->u16TxPktLen += u16Len;
     E1kLog3(("%s e1kFallbackAddSegment: pState->u16TxPktLen=%x\n",
-            INSTANCE(pState), pState->u16TxPktLen));
+            pState->szPrf, pState->u16TxPktLen));
     if (pState->u16HdrRemain > 0)
     {
@@ -3912 +3911 @@
             pState->u16HdrRemain -= u16Len;
             E1kLog3(("%s e1kFallbackAddSegment: Header is still incomplete, 0x%x bytes remain.\n",
-                    INSTANCE(pState), pState->u16HdrRemain));
+                    pState->szPrf, pState->u16HdrRemain));
             return;
         }
@@ -3925 +3924 @@
         pIpHdr->total_len = htons(pState->u16TxPktLen - pState->contextTSE.ip.u8CSS);
         E1kLog3(("%s e1kFallbackAddSegment: End of packet, pIpHdr->total_len=%x\n",
-                INSTANCE(pState), ntohs(pIpHdr->total_len)));
+                pState->szPrf, ntohs(pIpHdr->total_len)));
         /* Update IP Checksum */
         pIpHdr->chksum = 0;
@@ -3988 +3987 @@
 
     E1kLog3(("%s e1kFallbackAddSegment: Length=%x, remaining payload=%x, header=%x, send=%RTbool\n",
-             INSTANCE(pState), u16Len, pState->u32PayRemain, pState->u16HdrRemain, fSend));
+             pState->szPrf, u16Len, pState->u32PayRemain, pState->u16HdrRemain, fSend));
     Assert(pState->u32PayRemain + pState->u16HdrRemain > 0);
 
@@ -3996 +3995 @@
             "%.*Rhxd\n"
             "%s --- End of dump ---\n",
-            INSTANCE(pState), u16Len, pState->aTxPacketFallback + pState->u16TxPktLen, INSTANCE(pState)));
+            pState->szPrf, u16Len, pState->aTxPacketFallback + pState->u16TxPktLen, pState->szPrf));
     pState->u16TxPktLen += u16Len;
     E1kLog3(("%s e1kFallbackAddSegment: pState->u16TxPktLen=%x\n",
-            INSTANCE(pState), pState->u16TxPktLen));
+            pState->szPrf, pState->u16TxPktLen));
     if (pState->u16HdrRemain > 0)
     {
@@ -4019 +4018 @@
             pState->u16HdrRemain -= u16Len;
             E1kLog3(("%s e1kFallbackAddSegment: Header is still incomplete, 0x%x bytes remain.\n",
-                    INSTANCE(pState), pState->u16HdrRemain));
+                    pState->szPrf, pState->u16HdrRemain));
             return rc;
         }
@@ -4032 +4031 @@
         pIpHdr->total_len = htons(pState->u16TxPktLen - pState->contextTSE.ip.u8CSS);
         E1kLog3(("%s e1kFallbackAddSegment: End of packet, pIpHdr->total_len=%x\n",
-                INSTANCE(pState), ntohs(pIpHdr->total_len)));
+                pState->szPrf, ntohs(pIpHdr->total_len)));
         /* Update IP Checksum */
         pIpHdr->chksum = 0;
@@ -4249 +4248 @@
     if (RT_UNLIKELY( !fGso && cbNewPkt > E1K_MAX_TX_PKT_SIZE ))
     {
-        E1kLog(("%s Transmit packet is too large: %u > %u(max)\n", INSTANCE(pThis), cbNewPkt, E1K_MAX_TX_PKT_SIZE));
+        E1kLog(("%s Transmit packet is too large: %u > %u(max)\n", pThis->szPrf, cbNewPkt, E1K_MAX_TX_PKT_SIZE));
         return false;
     }
     if (RT_UNLIKELY( fGso && cbNewPkt > pTxSg->cbAvailable ))
     {
-        E1kLog(("%s Transmit packet is too large: %u > %u(max)/GSO\n", INSTANCE(pThis), cbNewPkt, pTxSg->cbAvailable));
+        E1kLog(("%s Transmit packet is too large: %u > %u(max)/GSO\n", pThis->szPrf, cbNewPkt, pTxSg->cbAvailable));
         return false;
     }
@@ -4324 +4323 @@
                 /* If absolute timer delay is enabled and the timer is not running yet, arm it. */
                 E1kLog2(("%s Checking if TAD timer is running\n",
-                         INSTANCE(pState)));
+                         pState->szPrf));
                 if (TADV != 0 && !TMTimerIsActive(pState->CTX_SUFF(pTADTimer)))
                     e1kArmTimer(pState, pState->CTX_SUFF(pTADTimer), TADV);
@@ -4332 +4331 @@
             {
                 E1kLog2(("%s No IDE set, cancel TAD timer and raise interrupt\n",
-                        INSTANCE(pState)));
+                        pState->szPrf));
 # ifndef E1K_NO_TAD
                 /* Cancel both timers if armed and fire immediately. */
@@ -4394 +4393 @@
             }
             E1kLog2(("%s %s context updated: IP CSS=%02X, IP CSO=%02X, IP CSE=%04X"
-                    ", TU CSS=%02X, TU CSO=%02X, TU CSE=%04X\n", INSTANCE(pState),
+                    ", TU CSS=%02X, TU CSO=%02X, TU CSE=%04X\n", pState->szPrf,
                      pDesc->context.dw2.fTSE ? "TSE" : "Normal",
                      pDesc->context.ip.u8CSS,
@@ -4410 +4409 @@
             if (pDesc->data.cmd.u20DTALEN == 0 || pDesc->data.u64BufAddr == 0)
             {
-                E1kLog2(("% Empty data descriptor, skipped.\n", INSTANCE(pState)));
+                E1kLog2(("% Empty data descriptor, skipped.\n", pState->szPrf));
                 /** @todo Same as legacy when !TSE. See below. */
                 break;
@@ -4440 +4439 @@
                 pState->fIPcsum  = pDesc->data.dw3.fIXSM;
                 pState->fTCPcsum = pDesc->data.dw3.fTXSM;
-                E1kLog2(("%s Saving checksum flags:%s%s; \n", INSTANCE(pState),
+                E1kLog2(("%s Saving checksum flags:%s%s; \n", pState->szPrf,
                          pState->fIPcsum ? " IP" : "",
                          pState->fTCPcsum ? " TCP/UDP" : ""));
@@ -4454 +4453 @@
                 else
                     cbVTag = 4;
-                E1kLog3(("%s About to allocate TX buffer: cbVTag=%u\n", INSTANCE(pState), cbVTag));
+                E1kLog3(("%s About to allocate TX buffer: cbVTag=%u\n", pState->szPrf, cbVTag));
                 if (e1kCanDoGso(pState, &pState->GsoCtx, &pDesc->data, &pState->contextTSE))
                     rc = e1kXmitAllocBuf(pState, pState->contextTSE.dw2.u20PAYLEN + pState->contextTSE.dw3.u8HDRLEN + cbVTag,
@@ -4498 +4497 @@
                     {
                         if (fRc)
-                           E1kLog(("%s bad GSO/TSE %p or %u < %u\n" , INSTANCE(pState),
+                           E1kLog(("%s bad GSO/TSE %p or %u < %u\n" , pState->szPrf,
                                    pState->CTX_SUFF(pTxSg), pState->CTX_SUFF(pTxSg) ? pState->CTX_SUFF(pTxSg)->cbUsed : 0,
                                    pState->contextTSE.dw3.u8HDRLEN + pState->contextTSE.dw2.u20PAYLEN));
@@ -4547 +4546 @@
             if (pDesc->legacy.cmd.u16Length == 0 || pDesc->legacy.u64BufAddr == 0)
             {
-                E1kLog(("%s Empty legacy descriptor, skipped.\n", INSTANCE(pState)));
+                E1kLog(("%s Empty legacy descriptor, skipped.\n", pState->szPrf));
                 /** @todo 3.3.3, Length/Buffer Address: RS set -> write DD when processing. */
                 break;
@@ -4561 +4560 @@
                 else
                     cbVTag = 4;
-                E1kLog3(("%s About to allocate TX buffer: cbVTag=%u\n", INSTANCE(pState), cbVTag));
+                E1kLog3(("%s About to allocate TX buffer: cbVTag=%u\n", pState->szPrf, cbVTag));
                 /** @todo reset status bits? */
                 rc = e1kXmitAllocBuf(pState, pDesc->legacy.cmd.u16Length + cbVTag, pDesc->legacy.cmd.fEOP, false /*fGso*/);
@@ -4602 +4601 @@
         default:
             E1kLog(("%s ERROR Unsupported transmit descriptor type: 0x%04x\n",
-                    INSTANCE(pState), e1kGetDescType(pDesc)));
+                    pState->szPrf, e1kGetDescType(pDesc)));
             break;
     }
@@ -4653 +4652 @@
             if (pDesc->data.cmd.u20DTALEN == 0 || pDesc->data.u64BufAddr == 0)
             {
-                E1kLog2(("% Empty data descriptor, skipped.\n", INSTANCE(pState)));
+                E1kLog2(("% Empty data descriptor, skipped.\n", pState->szPrf));
             }
             else
@@ -4677 +4676 @@
                         {
                             if (fRc)
-                                E1kLog(("%s bad GSO/TSE %p or %u < %u\n" , INSTANCE(pState),
+                                E1kLog(("%s bad GSO/TSE %p or %u < %u\n" , pState->szPrf,
                                         pState->CTX_SUFF(pTxSg), pState->CTX_SUFF(pTxSg) ? pState->CTX_SUFF(pTxSg)->cbUsed : 0,
                                         pState->contextTSE.dw3.u8HDRLEN + pState->contextTSE.dw2.u20PAYLEN));
@@ -4728 +4727 @@
             if (pDesc->legacy.cmd.u16Length == 0 || pDesc->legacy.u64BufAddr == 0)
             {
-                E1kLog(("%s Empty legacy descriptor, skipped.\n", INSTANCE(pState)));
+                E1kLog(("%s Empty legacy descriptor, skipped.\n", pState->szPrf));
             }
             else
@@ -4766 +4765 @@
         default:
             E1kLog(("%s ERROR Unsupported transmit descriptor type: 0x%04x\n",
-                    INSTANCE(pState), e1kGetDescType(pDesc)));
+                    pState->szPrf, e1kGetDescType(pDesc)));
             break;
     }
@@ -4790 +4789 @@
     }
     E1kLog2(("%s %s context updated: IP CSS=%02X, IP CSO=%02X, IP CSE=%04X"
-             ", TU CSS=%02X, TU CSO=%02X, TU CSE=%04X\n", INSTANCE(pState),
+             ", TU CSS=%02X, TU CSO=%02X, TU CSE=%04X\n", pState->szPrf,
              pDesc->context.dw2.fTSE ? "TSE" : "Normal",
              pDesc->context.ip.u8CSS,
@@ -4804 +4803 @@
 {
     LogFlow(("%s e1kLocateTxPacket: ENTER cbTxAlloc=%d\n",
-             INSTANCE(pState), pState->cbTxAlloc));
+             pState->szPrf, pState->cbTxAlloc));
     /* Check if we have located the packet already. */
     if (pState->cbTxAlloc)
     {
         LogFlow(("%s e1kLocateTxPacket: RET true cbTxAlloc=%d\n",
-                 INSTANCE(pState), pState->cbTxAlloc));
+                 pState->szPrf, pState->cbTxAlloc));
         return true;
     }
@@ -4881 +4880 @@
                 pState->cbTxAlloc += 4;
             LogFlow(("%s e1kLocateTxPacket: RET true cbTxAlloc=%d\n",
-                     INSTANCE(pState), pState->cbTxAlloc));
+                     pState->szPrf, pState->cbTxAlloc));
             return true;
         }
@@ -4890 +4889 @@
         /* All descriptors were empty, we need to process them as a dummy packet */
         LogFlow(("%s e1kLocateTxPacket: RET true cbTxAlloc=%d, zero packet!\n",
-                 INSTANCE(pState), pState->cbTxAlloc));
+                 pState->szPrf, pState->cbTxAlloc));
         return true;
     }
     LogFlow(("%s e1kLocateTxPacket: RET false cbTxAlloc=%d\n",
-             INSTANCE(pState), pState->cbTxAlloc));
+             pState->szPrf, pState->cbTxAlloc));
     return false;
 }
@@ -4904 +4903 @@
 
     LogFlow(("%s e1kXmitPacket: ENTER current=%d fetched=%d\n",
-             INSTANCE(pState), pState->iTxDCurrent, pState->nTxDFetched));
+             pState->szPrf, pState->iTxDCurrent, pState->nTxDFetched));
 
     while (pState->iTxDCurrent < pState->nTxDFetched)
@@ -4910 +4909 @@
         E1KTXDESC *pDesc = &pState->aTxDescriptors[pState->iTxDCurrent];
         E1kLog3(("%s About to process new TX descriptor at %08x%08x, TDLEN=%08x, TDH=%08x, TDT=%08x\n",
-                 INSTANCE(pState), TDBAH, TDBAL + TDH * sizeof(E1KTXDESC), TDLEN, TDH, TDT));
+                 pState->szPrf, TDBAH, TDBAL + TDH * sizeof(E1KTXDESC), TDLEN, TDH, TDT));
         rc = e1kXmitDesc(pState, pDesc, e1kDescAddr(TDBAH, TDBAL, TDH), fOnWorkerThread);
         if (RT_FAILURE(rc))
@@ -4920 +4919 @@
         {
             E1kLog2(("%s Low on transmit descriptors, raise ICR.TXD_LOW, len=%x thresh=%x\n",
-                     INSTANCE(pState), e1kGetTxLen(pState), GET_BITS(TXDCTL, LWTHRESH)*8));
+                     pState->szPrf, e1kGetTxLen(pState), GET_BITS(TXDCTL, LWTHRESH)*8));
             e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_TXD_LOW);
         }
@@ -4929 +4928 @@
 
     LogFlow(("%s e1kXmitPacket: RET %Rrc current=%d fetched=%d\n",
-             INSTANCE(pState), rc, pState->iTxDCurrent, pState->nTxDFetched));
+             pState->szPrf, rc, pState->iTxDCurrent, pState->nTxDFetched));
     return rc;
 }
@@ -4974 +4973 @@
             E1KTXDESC desc;
             E1kLog3(("%s About to process new TX descriptor at %08x%08x, TDLEN=%08x, TDH=%08x, TDT=%08x\n",
-                     INSTANCE(pState), TDBAH, TDBAL + TDH * sizeof(desc), TDLEN, TDH, TDT));
+                     pState->szPrf, TDBAH, TDBAL + TDH * sizeof(desc), TDLEN, TDH, TDT));
 
             e1kLoadDesc(pState, &desc, ((uint64_t)TDBAH << 32) + TDBAL + TDH * sizeof(desc));
@@ -4987 +4986 @@
             {
                 E1kLog2(("%s Low on transmit descriptors, raise ICR.TXD_LOW, len=%x thresh=%x\n",
-                         INSTANCE(pState), e1kGetTxLen(pState), GET_BITS(TXDCTL, LWTHRESH)*8));
+                         pState->szPrf, e1kGetTxLen(pState), GET_BITS(TXDCTL, LWTHRESH)*8));
                 e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_TXD_LOW);
             }
@@ -5103 +5102 @@
                 LogRel(("%s No complete packets in%s TxD cache! "
                       "Fetched=%d, current=%d, TX len=%d.\n",
-                      INSTANCE(pState),
+                      pState->szPrf,
                       u8Remain == E1K_TXD_CACHE_SIZE ? " full" : "",
                       pState->nTxDFetched, pState->iTxDCurrent,
@@ -5128 +5127 @@
                 Log4(("%s Incomplete packet at %d. Already fetched %d, "
                       "%d more are available\n",
-                      INSTANCE(pState), pState->iTxDCurrent, u8Remain,
+                      pState->szPrf, pState->iTxDCurrent, u8Remain,
                       e1kGetTxLen(pState) - u8Remain));
 
@@ -5150 +5149 @@
         {
             E1kLog2(("%s Out of transmit descriptors, raise ICR.TXD_LOW\n",
-                     INSTANCE(pState)));
+                     pState->szPrf));
             e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_TXD_LOW);
         }
@@ -5198 +5197 @@
     NOREF(pItem);
     E1KSTATE *pState = PDMINS_2_DATA(pDevIns, E1KSTATE *);
-    E1kLog2(("%s e1kTxQueueConsumer:\n", INSTANCE(pState)));
+    E1kLog2(("%s e1kTxQueueConsumer:\n", pState->szPrf));
 
     int rc = e1kXmitPending(pState, false /*fOnWorkerThread*/);
@@ -5234 +5233 @@
     /* Process them. */
     E1kLog2(("%s e1kRegWriteTDT: TDBAL=%08x, TDBAH=%08x, TDLEN=%08x, TDH=%08x, TDT=%08x\n",
-            INSTANCE(pState), TDBAL, TDBAH, TDLEN, TDH, TDT));
+            pState->szPrf, TDBAL, TDBAH, TDLEN, TDH, TDT));
 
     /* Ignore TDT writes when the link is down. */
@@ -5241 +5240 @@
         E1kLogRel(("E1000: TDT write: %d descriptors to process\n", e1kGetTxLen(pState)));
         E1kLog(("%s e1kRegWriteTDT: %d descriptors to process\n",
-                 INSTANCE(pState), e1kGetTxLen(pState)));
+                 pState->szPrf, e1kGetTxLen(pState)));
 
         /* Transmit pending packets if possible, defer it if we cannot do it
@@ -5405 +5404 @@
 {
     E1kLog(("%s At %08X read (00000000) attempt from unimplemented register %s (%s)\n",
-            INSTANCE(pState), offset, s_e1kRegMap[index].abbrev, s_e1kRegMap[index].name));
+            pState->szPrf, offset, s_e1kRegMap[index].abbrev, s_e1kRegMap[index].name));
     *pu32Value = 0;
 
@@ -5477 +5476 @@
 {
     E1kLog(("%s At %08X write attempt (%08X) to  unimplemented register %s (%s)\n",
-            INSTANCE(pState), offset, value, s_e1kRegMap[index].abbrev, s_e1kRegMap[index].name));
+            pState->szPrf, offset, value, s_e1kRegMap[index].abbrev, s_e1kRegMap[index].name));
 
     return VINF_SUCCESS;
@@ -5551 +5550 @@
     int         rc     = VINF_SUCCESS;
     int         index  = e1kRegLookup(pState, uOffset);
-    const char *szInst = INSTANCE(pState);
+    const char *szInst = pState->szPrf;
 #ifdef DEBUG
     char        buf[9];
@@ -5651 +5650 @@
     {
         E1kLog(("%s e1kRegWrite: Spec violation: unsupported op size: offset=%#10x cb=%#10x, ignored.\n",
-                INSTANCE(pState), offReg, cb));
+                pState->szPrf, offReg, cb));
         return VINF_SUCCESS;
     }
@@ -5657 +5656 @@
     {
         E1kLog(("%s e1kRegWrite: Spec violation: misaligned offset: %#10x cb=%#10x, ignored.\n",
-                INSTANCE(pState), offReg, cb));
+                pState->szPrf, offReg, cb));
         return VINF_SUCCESS;
     }
@@ -5670 +5669 @@
              */
             E1kLog2(("%s At %08X write          %08X  to  %s (%s)\n",
-                     INSTANCE(pState), offReg, u32, s_e1kRegMap[index].abbrev, s_e1kRegMap[index].name));
+                     pState->szPrf, offReg, u32, s_e1kRegMap[index].abbrev, s_e1kRegMap[index].name));
             //rc = e1kCsEnter(pState, VERR_SEM_BUSY, RT_SRC_POS);
             if (RT_UNLIKELY(rc != VINF_SUCCESS))
@@ -5683 +5682 @@
         {
             E1kLog(("%s At %08X write attempt (%08X) to  read-only register %s (%s)\n",
-                    INSTANCE(pState), offReg, u32, s_e1kRegMap[index].abbrev, s_e1kRegMap[index].name));
+                    pState->szPrf, offReg, u32, s_e1kRegMap[index].abbrev, s_e1kRegMap[index].name));
         }
     }
@@ -5689 +5688 @@
     {
         E1kLog(("%s At %08X write attempt (%08X) to  non-existing register\n",
-                INSTANCE(pState), offReg, u32));
+                pState->szPrf, offReg, u32));
     }
     return rc;
@@ -5772 +5771 @@
     E1KSTATE   *pState = PDMINS_2_DATA(pDevIns, E1KSTATE *);
     int         rc     = VINF_SUCCESS;
-    const char *szInst = INSTANCE(pState);
+    const char *szInst = pState->szPrf;
     STAM_PROFILE_ADV_START(&pState->CTX_SUFF_Z(StatIORead), a);
 
@@ -5822 +5821 @@
     E1KSTATE   *pState = PDMINS_2_DATA(pDevIns, E1KSTATE *);
     int         rc     = VINF_SUCCESS;
-    const char *szInst = INSTANCE(pState);
+    const char *szInst = pState->szPrf;
     STAM_PROFILE_ADV_START(&pState->CTX_SUFF_Z(StatIOWrite), a);
 
@@ -5871 +5870 @@
     for (int i = 0; i < E1K_NUM_OF_32BIT_REGS; ++i)
     {
-        E1kLog2(("%s %8.8s = %08x\n", INSTANCE(pState),
+        E1kLog2(("%s %8.8s = %08x\n", pState->szPrf,
                 s_e1kRegMap[i].abbrev, pState->auRegs[i]));
     }
 # ifdef E1K_INT_STATS
-    LogRel(("%s Interrupt attempts: %d\n", INSTANCE(pState), pState->uStatIntTry));
-    LogRel(("%s Interrupts raised : %d\n", INSTANCE(pState), pState->uStatInt));
-    LogRel(("%s Interrupts lowered: %d\n", INSTANCE(pState), pState->uStatIntLower));
-    LogRel(("%s Interrupts delayed: %d\n", INSTANCE(pState), pState->uStatIntDly));
-    LogRel(("%s Disabled delayed:   %d\n", INSTANCE(pState), pState->uStatDisDly));
-    LogRel(("%s Interrupts skipped: %d\n", INSTANCE(pState), pState->uStatIntSkip));
-    LogRel(("%s Masked interrupts : %d\n", INSTANCE(pState), pState->uStatIntMasked));
-    LogRel(("%s Early interrupts  : %d\n", INSTANCE(pState), pState->uStatIntEarly));
-    LogRel(("%s Late interrupts   : %d\n", INSTANCE(pState), pState->uStatIntLate));
-    LogRel(("%s Lost interrupts   : %d\n", INSTANCE(pState), pState->iStatIntLost));
-    LogRel(("%s Interrupts by RX  : %d\n", INSTANCE(pState), pState->uStatIntRx));
-    LogRel(("%s Interrupts by TX  : %d\n", INSTANCE(pState), pState->uStatIntTx));
-    LogRel(("%s Interrupts by ICS : %d\n", INSTANCE(pState), pState->uStatIntICS));
-    LogRel(("%s Interrupts by RDTR: %d\n", INSTANCE(pState), pState->uStatIntRDTR));
-    LogRel(("%s Interrupts by RDMT: %d\n", INSTANCE(pState), pState->uStatIntRXDMT0));
-    LogRel(("%s Interrupts by TXQE: %d\n", INSTANCE(pState), pState->uStatIntTXQE));
-    LogRel(("%s TX int delay asked: %d\n", INSTANCE(pState), pState->uStatTxIDE));
-    LogRel(("%s TX delayed:         %d\n", INSTANCE(pState), pState->uStatTxDelayed));
-    LogRel(("%s TX delay expired:   %d\n", INSTANCE(pState), pState->uStatTxDelayExp));
-    LogRel(("%s TX no report asked: %d\n", INSTANCE(pState), pState->uStatTxNoRS));
-    LogRel(("%s TX abs timer expd : %d\n", INSTANCE(pState), pState->uStatTAD));
-    LogRel(("%s TX int timer expd : %d\n", INSTANCE(pState), pState->uStatTID));
-    LogRel(("%s RX abs timer expd : %d\n", INSTANCE(pState), pState->uStatRAD));
-    LogRel(("%s RX int timer expd : %d\n", INSTANCE(pState), pState->uStatRID));
-    LogRel(("%s TX CTX descriptors: %d\n", INSTANCE(pState), pState->uStatDescCtx));
-    LogRel(("%s TX DAT descriptors: %d\n", INSTANCE(pState), pState->uStatDescDat));
-    LogRel(("%s TX LEG descriptors: %d\n", INSTANCE(pState), pState->uStatDescLeg));
-    LogRel(("%s Received frames   : %d\n", INSTANCE(pState), pState->uStatRxFrm));
-    LogRel(("%s Transmitted frames: %d\n", INSTANCE(pState), pState->uStatTxFrm));
-    LogRel(("%s TX frames up to 1514: %d\n", INSTANCE(pState), pState->uStatTx1514));
-    LogRel(("%s TX frames up to 2962: %d\n", INSTANCE(pState), pState->uStatTx2962));
-    LogRel(("%s TX frames up to 4410: %d\n", INSTANCE(pState), pState->uStatTx4410));
-    LogRel(("%s TX frames up to 5858: %d\n", INSTANCE(pState), pState->uStatTx5858));
-    LogRel(("%s TX frames up to 7306: %d\n", INSTANCE(pState), pState->uStatTx7306));
-    LogRel(("%s TX frames up to 8754: %d\n", INSTANCE(pState), pState->uStatTx8754));
-    LogRel(("%s TX frames up to 16384: %d\n", INSTANCE(pState), pState->uStatTx16384));
-    LogRel(("%s TX frames up to 32768: %d\n", INSTANCE(pState), pState->uStatTx32768));
-    LogRel(("%s Larger TX frames    : %d\n", INSTANCE(pState), pState->uStatTxLarge));
-    LogRel(("%s Max TX Delay        : %lld\n", INSTANCE(pState), pState->uStatMaxTxDelay));
+    LogRel(("%s Interrupt attempts: %d\n", pState->szPrf, pState->uStatIntTry));
+    LogRel(("%s Interrupts raised : %d\n", pState->szPrf, pState->uStatInt));
+    LogRel(("%s Interrupts lowered: %d\n", pState->szPrf, pState->uStatIntLower));
+    LogRel(("%s Interrupts delayed: %d\n", pState->szPrf, pState->uStatIntDly));
+    LogRel(("%s Disabled delayed:   %d\n", pState->szPrf, pState->uStatDisDly));
+    LogRel(("%s Interrupts skipped: %d\n", pState->szPrf, pState->uStatIntSkip));
+    LogRel(("%s Masked interrupts : %d\n", pState->szPrf, pState->uStatIntMasked));
+    LogRel(("%s Early interrupts  : %d\n", pState->szPrf, pState->uStatIntEarly));
+    LogRel(("%s Late interrupts   : %d\n", pState->szPrf, pState->uStatIntLate));
+    LogRel(("%s Lost interrupts   : %d\n", pState->szPrf, pState->iStatIntLost));
+    LogRel(("%s Interrupts by RX  : %d\n", pState->szPrf, pState->uStatIntRx));
+    LogRel(("%s Interrupts by TX  : %d\n", pState->szPrf, pState->uStatIntTx));
+    LogRel(("%s Interrupts by ICS : %d\n", pState->szPrf, pState->uStatIntICS));
+    LogRel(("%s Interrupts by RDTR: %d\n", pState->szPrf, pState->uStatIntRDTR));
+    LogRel(("%s Interrupts by RDMT: %d\n", pState->szPrf, pState->uStatIntRXDMT0));
+    LogRel(("%s Interrupts by TXQE: %d\n", pState->szPrf, pState->uStatIntTXQE));
+    LogRel(("%s TX int delay asked: %d\n", pState->szPrf, pState->uStatTxIDE));
+    LogRel(("%s TX delayed:         %d\n", pState->szPrf, pState->uStatTxDelayed));
+    LogRel(("%s TX delay expired:   %d\n", pState->szPrf, pState->uStatTxDelayExp));
+    LogRel(("%s TX no report asked: %d\n", pState->szPrf, pState->uStatTxNoRS));
+    LogRel(("%s TX abs timer expd : %d\n", pState->szPrf, pState->uStatTAD));
+    LogRel(("%s TX int timer expd : %d\n", pState->szPrf, pState->uStatTID));
+    LogRel(("%s RX abs timer expd : %d\n", pState->szPrf, pState->uStatRAD));
+    LogRel(("%s RX int timer expd : %d\n", pState->szPrf, pState->uStatRID));
+    LogRel(("%s TX CTX descriptors: %d\n", pState->szPrf, pState->uStatDescCtx));
+    LogRel(("%s TX DAT descriptors: %d\n", pState->szPrf, pState->uStatDescDat));
+    LogRel(("%s TX LEG descriptors: %d\n", pState->szPrf, pState->uStatDescLeg));
+    LogRel(("%s Received frames   : %d\n", pState->szPrf, pState->uStatRxFrm));
+    LogRel(("%s Transmitted frames: %d\n", pState->szPrf, pState->uStatTxFrm));
+    LogRel(("%s TX frames up to 1514: %d\n", pState->szPrf, pState->uStatTx1514));
+    LogRel(("%s TX frames up to 2962: %d\n", pState->szPrf, pState->uStatTx2962));
+    LogRel(("%s TX frames up to 4410: %d\n", pState->szPrf, pState->uStatTx4410));
+    LogRel(("%s TX frames up to 5858: %d\n", pState->szPrf, pState->uStatTx5858));
+    LogRel(("%s TX frames up to 7306: %d\n", pState->szPrf, pState->uStatTx7306));
+    LogRel(("%s TX frames up to 8754: %d\n", pState->szPrf, pState->uStatTx8754));
+    LogRel(("%s TX frames up to 16384: %d\n", pState->szPrf, pState->uStatTx16384));
+    LogRel(("%s TX frames up to 32768: %d\n", pState->szPrf, pState->uStatTx32768));
+    LogRel(("%s Larger TX frames    : %d\n", pState->szPrf, pState->uStatTxLarge));
+    LogRel(("%s Max TX Delay        : %lld\n", pState->szPrf, pState->uStatMaxTxDelay));
 # endif /* E1K_INT_STATS */
 }
@@ -6012 +6011 @@
     }
     E1kLog2(("%s e1kCanReceive: at exit RDH=%d RDT=%d RDLEN=%d u16RxBSize=%d cb=%lu\n",
-             INSTANCE(pState), RDH, RDT, RDLEN, pState->u16RxBSize, cb));
+             pState->szPrf, RDH, RDT, RDLEN, pState->u16RxBSize, cb));
 
     e1kCsRxLeave(pState);
@@ -6036 +6035 @@
     }
     E1kLog2(("%s e1kCanReceive: at exit in_cache=%d RDH=%d RDT=%d RDLEN=%d"
-             " u16RxBSize=%d rc=%Rrc\n", INSTANCE(pState),
+             " u16RxBSize=%d rc=%Rrc\n", pState->szPrf,
              e1kRxDInCache(pState), RDH, RDT, RDLEN, pState->u16RxBSize, rc));
 
@@ -6071 +6070 @@
         }
         E1kLogRel(("E1000 e1kNetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n", cMillies));
-        E1kLog(("%s e1kNetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n", INSTANCE(pState), cMillies));
+        E1kLog(("%s e1kNetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n", pState->szPrf, cMillies));
         RTSemEventWait(pState->hEventMoreRxDescAvail, cMillies);
     }
@@ -6103 +6102 @@
             //unsigned char *pAddr = (unsigned char*)pvBuf + sizeof(ra->addr)*(ra->ctl & RA_CTL_AS);
             //E1kLog3(("%s Matching %02x:%02x:%02x:%02x:%02x:%02x against %02x:%02x:%02x:%02x:%02x:%02x...\n",
-            //         INSTANCE(pState), pAddr[0], pAddr[1], pAddr[2], pAddr[3], pAddr[4], pAddr[5],
+            //         pState->szPrf, pAddr[0], pAddr[1], pAddr[2], pAddr[3], pAddr[4], pAddr[5],
             //         ra->addr[0], ra->addr[1], ra->addr[2], ra->addr[3], ra->addr[4], ra->addr[5]));
             /*
@@ -6179 +6178 @@
     {
         E1kLog(("%s ERROR: Incoming packet is too big, cb=%d > max=%d\n",
-                INSTANCE(pState), cb, E1K_MAX_RX_PKT_SIZE));
+                pState->szPrf, cb, E1K_MAX_RX_PKT_SIZE));
         E1K_INC_CNT32(ROC);
         return false;
@@ -6187 +6186 @@
         /* When long packet reception is disabled packets over 1522 are discarded */
         E1kLog(("%s Discarding incoming packet (LPE=0), cb=%d\n",
-                INSTANCE(pState), cb));
+                pState->szPrf, cb));
         E1K_INC_CNT32(ROC);
         return false;
@@ -6203 +6202 @@
             if (RCTL & RCTL_CFIEN)
             {
-                E1kLog3(("%s VLAN filter: VLAN=%d CFI=%d RCTL_CFI=%d\n", INSTANCE(pState),
+                E1kLog3(("%s VLAN filter: VLAN=%d CFI=%d RCTL_CFI=%d\n", pState->szPrf,
                          E1K_SPEC_VLAN(RT_BE2H_U16(u16Ptr[7])),
                          E1K_SPEC_CFI(RT_BE2H_U16(u16Ptr[7])),
@@ -6210 +6209 @@
                 {
                     E1kLog2(("%s Packet filter: CFIs do not match in packet and RCTL (%d!=%d)\n",
-                             INSTANCE(pState), E1K_SPEC_CFI(RT_BE2H_U16(u16Ptr[7])), !!(RCTL & RCTL_CFI)));
+                             pState->szPrf, E1K_SPEC_CFI(RT_BE2H_U16(u16Ptr[7])), !!(RCTL & RCTL_CFI)));
                     return false;
                 }
             }
             else
-                E1kLog3(("%s VLAN filter: VLAN=%d\n", INSTANCE(pState),
+                E1kLog3(("%s VLAN filter: VLAN=%d\n", pState->szPrf,
                          E1K_SPEC_VLAN(RT_BE2H_U16(u16Ptr[7]))));
             if (!ASMBitTest(pState->auVFTA, E1K_SPEC_VLAN(RT_BE2H_U16(u16Ptr[7]))))
             {
                 E1kLog2(("%s Packet filter: no VLAN match (id=%d)\n",
-                         INSTANCE(pState), E1K_SPEC_VLAN(RT_BE2H_U16(u16Ptr[7]))));
+                         pState->szPrf, E1K_SPEC_VLAN(RT_BE2H_U16(u16Ptr[7]))));
                 return false;
             }
@@ -6228 +6227 @@
     if (e1kIsBroadcast(pvBuf) && (RCTL & RCTL_BAM))
         return true;
-    E1kLog2(("%s Packet filter: not a broadcast\n", INSTANCE(pState)));
+    E1kLog2(("%s Packet filter: not a broadcast\n", pState->szPrf));
     if (e1kIsMulticast(pvBuf))
     {
@@ -6234 +6233 @@
         if (RCTL & RCTL_MPE)
             return true;
-        E1kLog2(("%s Packet filter: no promiscuous multicast\n", INSTANCE(pState)));
+        E1kLog2(("%s Packet filter: no promiscuous multicast\n", pState->szPrf));
         /* Try perfect matches first */
         if (e1kPerfectMatch(pState, pvBuf))
@@ -6241 +6240 @@
             return true;
         }
-        E1kLog2(("%s Packet filter: no perfect match\n", INSTANCE(pState)));
+        E1kLog2(("%s Packet filter: no perfect match\n", pState->szPrf));
         if (e1kImperfectMatch(pState, pvBuf))
             return true;
-        E1kLog2(("%s Packet filter: no imperfect match\n", INSTANCE(pState)));
+        E1kLog2(("%s Packet filter: no imperfect match\n", pState->szPrf));
     }
     else {
@@ -6250 +6249 @@
         if (RCTL & RCTL_UPE)
             return true;
-        E1kLog2(("%s Packet filter: no promiscuous unicast\n", INSTANCE(pState)));
+        E1kLog2(("%s Packet filter: no promiscuous unicast\n", pState->szPrf));
         if (e1kPerfectMatch(pState, pvBuf))
         {
@@ -6256 +6255 @@
             return true;
         }
-        E1kLog2(("%s Packet filter: no perfect match\n", INSTANCE(pState)));
-    }
-    E1kLog2(("%s Packet filter: packet discarded\n", INSTANCE(pState)));
+        E1kLog2(("%s Packet filter: no perfect match\n", pState->szPrf));
+    }
+    E1kLog2(("%s Packet filter: packet discarded\n", pState->szPrf));
     return false;
 }
@@ -6277 +6276 @@
         &&  enmVMState != VMSTATE_RUNNING_LS)
     {
-        E1kLog(("%s Dropping incoming packet as VM is not running.\n", INSTANCE(pState)));
+        E1kLog(("%s Dropping incoming packet as VM is not running.\n", pState->szPrf));
         return VINF_SUCCESS;
     }
@@ -6284 +6283 @@
     if (!(RCTL & RCTL_EN) || pState->fLocked || !(STATUS & STATUS_LU))
     {
-        E1kLog(("%s Dropping incoming packet as receive operation is disabled.\n", INSTANCE(pState)));
+        E1kLog(("%s Dropping incoming packet as receive operation is disabled.\n", pState->szPrf));
         return VINF_SUCCESS;
     }
@@ -6376 +6375 @@
         {
             E1kLog(("%s Link will be up in approximately %d secs\n",
-                    INSTANCE(pState), pState->cMsLinkUpDelay / 1000));
+                    pState->szPrf, pState->cMsLinkUpDelay / 1000));
             pState->fCableConnected = true;
             STATUS &= ~STATUS_LU;
@@ -6386 +6385 @@
         else
         {
-            E1kLog(("%s Link is down\n", INSTANCE(pState)));
+            E1kLog(("%s Link is down\n", pState->szPrf));
             pState->fCableConnected = false;
             STATUS &= ~STATUS_LU;
@@ -6472 +6471 @@
     e1kCancelTimer(pState, pState->CTX_SUFF(pIntTimer));
     /* 3) Did I forget anything? */
-    E1kLog(("%s Locked\n", INSTANCE(pState)));
+    E1kLog(("%s Locked\n", pState->szPrf));
     return VINF_SUCCESS;
 #endif
@@ -6523 +6522 @@
 #endif /* E1K_WITH_TXD_CACHE */
 /**@todo GSO requires some more state here. */
-    E1kLog(("%s State has been saved\n", INSTANCE(pState)));
+    E1kLog(("%s State has been saved\n", pState->szPrf));
     return VINF_SUCCESS;
 }
@@ -6539 +6538 @@
         pState->fLocked = false;
     else
-        E1kLog(("%s VM is not running -- remain locked\n", INSTANCE(pState)));
-    E1kLog(("%s Unlocked\n", INSTANCE(pState)));
+        E1kLog(("%s VM is not running -- remain locked\n", pState->szPrf));
+    E1kLog(("%s Unlocked\n", pState->szPrf));
     return VINF_SUCCESS;
 }
@@ -6584 +6583 @@
         if (   memcmp(&macConfigured, &pState->macConfigured, sizeof(macConfigured))
             && (uPass == 0 || !PDMDevHlpVMTeleportedAndNotFullyResumedYet(pDevIns)) )
-            LogRel(("%s: The mac address differs: config=%RTmac saved=%RTmac\n", INSTANCE(pState), &pState->macConfigured, &macConfigured));
+            LogRel(("%s: The mac address differs: config=%RTmac saved=%RTmac\n", pState->szPrf, &pState->macConfigured, &macConfigured));
 
         E1KCHIP eChip;
@@ -6657 +6656 @@
         e1kSetupGsoCtx(&pState->GsoCtx, &pState->contextTSE);
 
-        E1kLog(("%s State has been restored\n", INSTANCE(pState)));
+        E1kLog(("%s State has been restored\n", pState->szPrf));
         e1kDumpState(pState);
     }
@@ -6684 +6683 @@
         && pState->cMsLinkUpDelay)
     {
-        E1kLog(("%s Link is down temporarily\n", INSTANCE(pState)));
+        E1kLog(("%s Link is down temporarily\n", pState->szPrf));
         STATUS &= ~STATUS_LU;
         Phy::setLinkStatus(&pState->phy, false);
@@ -7004 +7003 @@
 {
     E1KSTATE *pState = PDMINS_2_DATA(pDevIns, E1KSTATE*);
-    Log(("%s e1kR3Detach:\n", INSTANCE(pState)));
+    Log(("%s e1kR3Detach:\n", pState->szPrf));
 
     AssertLogRelReturnVoid(iLUN == 0);
@@ -7040 +7039 @@
 {
     E1KSTATE *pState = PDMINS_2_DATA(pDevIns, E1KSTATE*);
-    LogFlow(("%s e1kR3Attach:\n",  INSTANCE(pState)));
+    LogFlow(("%s e1kR3Attach:\n",  pState->szPrf));
 
     AssertLogRelReturn(iLUN == 0, VERR_PDM_NO_SUCH_LUN);
@@ -7079 +7078 @@
         /* This should never happen because this function is not called
          * if there is no driver to attach! */
-        Log(("%s No attached driver!\n", INSTANCE(pState)));
+        Log(("%s No attached driver!\n", pState->szPrf));
     }
 
@@ -7195 +7194 @@
 
     e1kDumpState(pState);
-    E1kLog(("%s Destroying instance\n", INSTANCE(pState)));
+    E1kLog(("%s Destroying instance\n", pState->szPrf));
     if (PDMCritSectIsInitialized(&pState->cs))
     {
@@ -7300 +7299 @@
      * Note! Caller has initialized it to ZERO already.
      */
-    RTStrPrintf(pThis->szInstance, sizeof(pThis->szInstance), "E1000#%d", iInstance);
-    E1kLog(("%s Constructing new instance sizeof(E1KRXDESC)=%d\n", INSTANCE(pThis), sizeof(E1KRXDESC)));
+    RTStrPrintf(pThis->szPrf, sizeof(pThis->szPrf), "E1000#%d", iInstance);
+    E1kLog(("%s Constructing new instance sizeof(E1KRXDESC)=%d\n", pThis->szPrf, sizeof(E1KRXDESC)));
     pThis->hEventMoreRxDescAvail = NIL_RTSEMEVENT;
     pThis->pDevInsR3    = pDevIns;
@@ -7386 +7385 @@
     Assert(pThis->cMsLinkUpDelay <= 300000); /* less than 5 minutes */
     if (pThis->cMsLinkUpDelay > 5000)
-        LogRel(("%s WARNING! Link up delay is set to %u seconds!\n", INSTANCE(pThis), pThis->cMsLinkUpDelay / 1000));
+        LogRel(("%s WARNING! Link up delay is set to %u seconds!\n", pThis->szPrf, pThis->cMsLinkUpDelay / 1000));
     else if (pThis->cMsLinkUpDelay == 0)
-        LogRel(("%s WARNING! Link up delay is disabled!\n", INSTANCE(pThis)));
-
-    E1kLog(("%s Chip=%s LinkUpDelay=%ums EthernetCRC=%s GSO=%s\n", INSTANCE(pThis),
+        LogRel(("%s WARNING! Link up delay is disabled!\n", pThis->szPrf));
+
+    E1kLog(("%s Chip=%s LinkUpDelay=%ums EthernetCRC=%s GSO=%s\n", pThis->szPrf,
             g_Chips[pThis->eChip].pcszName, pThis->cMsLinkUpDelay,
             pThis->fEthernetCRC ? "on" : "off",
@@ -7406 +7405 @@
     AssertRCReturn(rc, rc);
 
-    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->cs, RT_SRC_POS, "%s", pThis->szInstance);
+    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->cs, RT_SRC_POS, "E1000#%d", iInstance);
     if (RT_FAILURE(rc))
         return rc;
-    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->csRx, RT_SRC_POS, "%sRX", pThis->szInstance);
+    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->csRx, RT_SRC_POS, "E1000#%dRX", iInstance);
     if (RT_FAILURE(rc))
         return rc;
 #ifdef E1K_WITH_TX_CS
-    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->csTx, RT_SRC_POS, "%sTX", pThis->szInstance);
+    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->csTx, RT_SRC_POS, "E1000#%dTX", iInstance);
     if (RT_FAILURE(rc))
         return rc;
@@ -7571 +7570 @@
     {
         /* No error! */
-        E1kLog(("%s This adapter is not attached to any network!\n", INSTANCE(pThis)));
+        E1kLog(("%s This adapter is not attached to any network!\n", pThis->szPrf));
     }
     else