Changeset 83028 in vbox

Timestamp:

Feb 9, 2020 10:05:09 PM (5 years ago)

Author:

vboxsync

Message:

Network/DevVirtioNet_1_0.cpp: Fixed but in Virtio_1_0.cpp virtioWriteUsedFlags. Can now read guest MAC filter table properly.

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet_1_0.cpp (modified) (77 diffs)
• VirtIO/Virtio_1_0.cpp (modified) (2 diffs)

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

@@ -59 +59 @@
 #include "VBoxDD.h"
 
+/** @todo FIX UP THESE HACKS AFTER DEBUGGING */
+
+/* After debugging single instance case, restore instance name logging */
+#define INSTANCE(pState) (char *)(pState->szInstanceName ? "" : "") // Avoid requiring RT_NOREF in some funcs
+
+
 #define VIRTIONET_SAVED_STATE_VERSION          UINT32_C(1)
 #define VIRTIONET_MAX_QPAIRS                   1
@@ -67 +73 @@
 #define VIRTIONET_PREALLOCATE_RX_SEG_COUNT     32
 
-#define INSTANCE(pState) pState->szInstanceName
+
 #define QUEUE_NAME(a_pVirtio, a_idxQueue) ((a_pVirtio)->virtqState[(a_idxQueue)].szVirtqName)
 #define VIRTQNAME(idxQueue)           (pThis->aszVirtqNames[idxQueue])
@@ -471 +477 @@
 
 } VIRTIONETR3;
+
+
 /** Pointer to the ring-3 state of the VirtIO Host NET device. */
 typedef VIRTIONETR3 *PVIRTIONETR3;
@@ -513 +521 @@
 static DECLCALLBACK(int) virtioNetR3WakeupWorker(PPDMDEVINS pDevIns, PPDMTHREAD pThread)
 {
-    LogFunc(("\n"));
     PVIRTIONET pThis = PDMDEVINS_2_DATA(pDevIns, PVIRTIONET);
+    LogFunc(("%s\n", INSTANCE(pThis)));
     return PDMDevHlpSUPSemEventSignal(pDevIns, pThis->aWorkers[(uintptr_t)pThread->pvUser].hEvtProcess);
 }
@@ -612 +620 @@
 DECLINLINE(bool) virtioNetValidateRequiredFeatures(uint32_t fFeatures)
 {
-    LogFunc(("\n"));
     uint32_t fGuestChksumRequired =   fFeatures & VIRTIONET_F_GUEST_TSO4
                                    || fFeatures & VIRTIONET_F_GUEST_TSO6
@@ -694 +701 @@
         uint32_t offIntra = offConfig - RT_UOFFSETOF(VIRTIONET_CONFIG_T, member); \
         if (fWrite) \
-            LogFunc(("Guest attempted to write readonly virtio_pci_common_cfg.%s\n", #member)); \
+            LogFunc(("%s Guest attempted to write readonly virtio_pci_common_cfg.%s\n", INSTANCE(pThis), #member)); \
         else \
         { \
@@ -721 +728 @@
     else
     {
-        LogFunc(("Bad access by guest to virtio_net_config: off=%u (%#x), cb=%u\n", offConfig, offConfig, cb));
+        LogFunc(("%s Bad access by guest to virtio_net_config: off=%u (%#x), cb=%u\n", INSTANCE(pThis), offConfig, offConfig, cb));
         return fWrite ? VINF_SUCCESS : VINF_IOM_MMIO_UNUSED_00;
     }
@@ -739 +746 @@
     PVIRTIONET pThis = PDMDEVINS_2_DATA(pDevIns, PVIRTIONET);
 
-    LogFunc(("%s: uOffset: %d, cb: %d\n",  INSTANCE(pThis), uOffset, cb));
+    LogFunc(("%s uOffset: %d, cb: %d\n",  INSTANCE(pThis), uOffset, cb));
     return virtioNetR3CfgAccessed(PDMDEVINS_2_DATA(pDevIns, PVIRTIONET), uOffset, pv, cb, false /*fRead*/);
 }
@@ -750 +757 @@
     PVIRTIONET pThis = PDMDEVINS_2_DATA(pDevIns, PVIRTIONET);
 
-    LogFunc(("%s: uOffset: %d, cb: %d: %.*Rhxs\n", INSTANCE(pThis), uOffset, cb, RT_MAX(cb, 8) , pv));
+    LogFunc(("%s uOffset: %d, cb: %d: %.*Rhxs\n", INSTANCE(pThis), uOffset, cb, RT_MAX(cb, 8) , pv));
     return virtioNetR3CfgAccessed(PDMDEVINS_2_DATA(pDevIns, PVIRTIONET), uOffset, (void *)pv, cb, true /*fWrite*/);
 }
@@ -790 +797 @@
 
     RT_NOREF(pThisCC);
-    LogFunc(("LOAD EXEC!!\n"));
+    LogFunc(("%s LOAD EXEC!!\n", INSTANCE(pThis)));
 
     AssertReturn(uPass == SSM_PASS_FINAL, VERR_SSM_UNEXPECTED_PASS);
@@ -813 +820 @@
         if (pThis->afQueueAttached[idxQueue])
         {
-            LogFunc(("Waking %s worker.\n", VIRTQNAME(idxQueue)));
+            LogFunc(("%s Waking %s worker.\n", INSTANCE(pThis), VIRTQNAME(idxQueue)));
             rc = PDMDevHlpSUPSemEventSignal(pDevIns, pThis->aWorkers[idxQueue].hEvtProcess);
             AssertRCReturn(rc, rc);
@@ -832 +839 @@
     RT_NOREF(pThisCC);
 
-    LogFunc(("SAVE EXEC!!\n"));
+    LogFunc(("%s SAVE EXEC!!\n", INSTANCE(pThis)));
 
     for (int idxQueue = 0; idxQueue < pThis->cVirtQueues; idxQueue++)
@@ -858 +865 @@
     /** @todo create test to conclusively determine I/O has been quiesced and add it here: */
 
-    LogFunc(("Device I/O activity quiesced: %s\n",
-        virtioCoreGetStateChangeText(pThisCC->enmQuiescingFor)));
+    LogFunc(("%s Device I/O activity quiesced: %s\n",
+        INSTANCE(pThis), virtioCoreGetStateChangeText(pThisCC->enmQuiescingFor)));
 
     virtioCoreR3VmStateChanged(&pThis->Virtio, pThisCC->enmQuiescingFor);
@@ -904 +911 @@
 {
     PVIRTIONET pThis = PDMDEVINS_2_DATA(pDevIns, PVIRTIONET);
-    LogFunc(("\n"));
+    LogFunc(("%s\n", INSTANCE(pThis)));
     pThis->fResetting = true;
     virtioNetR3QuiesceDevice(pDevIns, kvirtIoVmStateChangedReset);
@@ -914 +921 @@
 static DECLCALLBACK(void) virtioNetR3SuspendOrPowerOff(PPDMDEVINS pDevIns, VIRTIOVMSTATECHANGED enmType)
 {
-    LogFunc(("\n"));
 
     PVIRTIONET   pThis   = PDMDEVINS_2_DATA(pDevIns, PVIRTIONET);
     PVIRTIONETCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PVIRTIONETCC);
+    LogFunc(("%s\n", INSTANCE(pThis)));
 
     RT_NOREF2(pThis, pThisCC);
@@ -929 +936 @@
 static DECLCALLBACK(void) virtioNetR3PowerOff(PPDMDEVINS pDevIns)
 {
-    LogFunc(("\n"));
+    PVIRTIONET   pThis   = PDMDEVINS_2_DATA(pDevIns, PVIRTIONET);
+    LogFunc(("%s\n", INSTANCE(pThis)));
+
     virtioNetR3SuspendOrPowerOff(pDevIns, kvirtIoVmStateChangedPowerOff);
 }
@@ -938 +947 @@
 static DECLCALLBACK(void) virtioNetR3Suspend(PPDMDEVINS pDevIns)
 {
-    LogFunc(("\n"));
+    PVIRTIONET   pThis   = PDMDEVINS_2_DATA(pDevIns, PVIRTIONET);
+    LogFunc(("%s \n", INSTANCE(pThis)));
     virtioNetR3SuspendOrPowerOff(pDevIns, kvirtIoVmStateChangedSuspend);
 }
@@ -965 +975 @@
         if (ASMAtomicReadBool(&pThisCC->aWorkers[idxQueue].fSleeping))
         {
-            Log6Func(("waking %s worker.\n", VIRTQNAME(idxQueue)));
+            Log6Func(("%s waking %s worker.\n", INSTANCE(pThis), VIRTQNAME(idxQueue)));
             int rc = PDMDevHlpSUPSemEventSignal(pDevIns, pThis->aWorkers[idxQueue].hEvtProcess);
             AssertRC(rc);
@@ -1048 +1058 @@
     int rc;
 
-    LogFlowFunc(("%s: idxQueue = %d\n", INSTANCE(pThis), idxQueue));
+    LogFunc(("%s %s\n", INSTANCE(pThis), VIRTQNAME(idxQueue)));
 
     if (!pThis->fVirtioReady)
@@ -1067 +1077 @@
     }
 
-    LogFlowFunc(("%s: idxQueue = %d -> %Rrc\n", INSTANCE(pThis), idxQueue, rc));
+    LogFlowFunc(("%s idxQueue = %d -> %Rrc\n", INSTANCE(pThis), idxQueue, rc));
     return rc;
 }
@@ -1100 +1110 @@
     if (!virtioNetAllSystemsGo(pThis, pDevIns))
     {
-        LogFunc(("VirtIO not ready\n"));
+        LogFunc(("%s VirtIO not ready\n", INSTANCE(pThis)));
         return VERR_NET_NO_BUFFER_SPACE;
     }
@@ -1107 +1117 @@
         return VERR_NET_NO_BUFFER_SPACE;
 
-    LogFlowFunc(("%s: timeoutMs=%u\n", INSTANCE(pThis), timeoutMs));
+    LogFlowFunc(("%s timeoutMs=%u\n", INSTANCE(pThis), timeoutMs));
 
     ASMAtomicXchgBool(&pThis->fLeafWantsRxBuffers, true);
@@ -1121 +1131 @@
             if (RT_SUCCESS(virtioNetR3IsRxQueuePrimed(pDevIns, pThis, idxQueue)))
             {
-                LogFunc(("Rx bufs now available, releasing waiter..."));
+                LogFunc(("%s Rx bufs now available, releasing waiter...", INSTANCE(pThis)));
                 return VINF_SUCCESS;
             }
         }
-        LogFunc(("%s: Starved for guest Rx bufs, waiting %u ms ...\n",
+        LogFunc(("%s Starved for guest Rx bufs, waiting %u ms ...\n",
                  INSTANCE(pThis), timeoutMs));
 
@@ -1141 +1151 @@
     ASMAtomicXchgBool(&pThis->fLeafWantsRxBuffers, false);
 
-    LogFlowFunc(("%s: Wait for Rx buffers available was interrupted\n", INSTANCE(pThis)));
+    LogFlowFunc(("%s Wait for Rx buffers available was interrupted\n", INSTANCE(pThis)));
     return VERR_INTERRUPTED;
 }
@@ -1236 +1246 @@
 static bool virtioNetR3AddressFilter(PVIRTIONET pThis, const void *pvBuf, size_t cb)
 {
-    LogFunc(("\n"));
+    LogFunc(("%s\n", INSTANCE(pThis)));
 
     if (pThis->fPromiscuous)
@@ -1248 +1258 @@
         && !ASMBitTest(pThis->aVlanFilter, RT_BE2H_U16(uPtr[7]) & 0xFFF))
     {
-        Log4Func(("%s: not our VLAN, returning false\n", INSTANCE(pThis)));
+        Log4Func(("%s not our VLAN, returning false\n", INSTANCE(pThis)));
         return false;
     }
@@ -1274 +1284 @@
             return true;
 
-    Log2Func(("%s: failed all tests, returning false, packet dump follows:\n",
+    Log2Func(("%s failed all tests, returning false, packet dump follows:\n",
         INSTANCE(pThis)));
 
@@ -1302 +1312 @@
     RT_NOREF(pThisCC);
 
-    LogFunc(("\n"));
+    LogFunc(("%s\n", INSTANCE(pThis)));
     VIRTIONET_PKT_HDR_T rxPktHdr;
 
@@ -1449 +1459 @@
     PVIRTIONET      pThis   = PDMDEVINS_2_DATA(pDevIns, PVIRTIONET);
 
-    LogFunc(("\n"));
+    LogFunc(("%s\n", pThis));
 
     if (!pThis->fVirtioReady)
@@ -1525 +1535 @@
 
 /* Read physical bytes from the out segment(s) of descriptor chain */
-static void virtioNetR3PullChain(PPDMDEVINS pDevIns, PVIRTIO_DESC_CHAIN_T pDescChain, void *pv, uint16_t cb)
+static void virtioNetR3PullChain(PPDMDEVINS pDevIns, PVIRTIONET pThis, PVIRTIO_DESC_CHAIN_T pDescChain, void *pv, uint16_t cb)
 {
     uint8_t *pb = (uint8_t *)pv;
@@ -1538 +1548 @@
         pDescChain->cbPhysSend -= cbSeg;
     }
-    LogFunc(("Pulled %d / %d bytes from desc chain (%d bytes left in desc chain)\n",
-             cb - cbLim, cb, pDescChain->cbPhysSend));
+    LogFunc(("%s Pulled %d/%d bytes from desc chain (%d bytes left)\n",
+             INSTANCE(pThis), cb - cbLim, cb, pDescChain->cbPhysSend));
 }
 
@@ -1546 +1556 @@
 {
 
-#define LOG_VIRTIONET_FLAG(fld) LogFunc(("%s = %d\n", #fld, pThis->fld))
-
-    LogFunc(("Processing CTRL Rx command\n"));
+#define LOG_VIRTIONET_FLAG(fld) LogFunc(("%s Setting %s=%d\n", INSTANCE(pThis), #fld, pThis->fld))
+
+    LogFunc(("%s Processing CTRL Rx command\n", INSTANCE(pThis)));
     switch(pCtrlPktHdr->uCmd)
     {
@@ -1569 +1579 @@
 
     uint8_t fOn, fPromiscChanged = false;
-    virtioNetR3PullChain(pDevIns, pDescChain, &fOn, RT_MIN(pDescChain->cbPhysSend, sizeof(fOn)));
+    virtioNetR3PullChain(pDevIns, pThis, pDescChain, &fOn, RT_MIN(pDescChain->cbPhysSend, sizeof(fOn)));
 
     switch(pCtrlPktHdr->uCmd)
@@ -1604 +1614 @@
     {
         uint8_t fPromiscuous = pThis->fPromiscuous | pThis->fAllMulticast;
-        LogFunc(("Setting promiscuous state to %d\n", fPromiscuous));
         pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, fPromiscuous);
     }
@@ -1614 +1623 @@
                                   PVIRTIONET_CTRL_HDR_T pCtrlPktHdr, PVIRTIO_DESC_CHAIN_T pDescChain)
 {
-    LogFunc(("Processing CTRL MAC command\n"));
+    LogFunc(("%s Processing CTRL MAC command\n", INSTANCE(pThis)));
 
     RT_NOREF(pThisCC);
@@ -1629 +1638 @@
 
     size_t cbRemaining = pDescChain->cbPhysSend;
-Log6Func(("initial:cbRemaining=%d pDescChain->cbPhysSend=%d sizeof(*pCtrlPktHdr)=%d\n",
-         cbRemaining, pDescChain->cbPhysSend, sizeof(*pCtrlPktHdr)));
     switch(pCtrlPktHdr->uCmd)
     {
@@ -1637 +1644 @@
             /* Set default Rx filter MAC */
             ASSERT_CTRL_ADDR_SET(cbRemaining >= sizeof(VIRTIONET_CTRL_MAC_TABLE_LEN));
-            virtioNetR3PullChain(pDevIns, pDescChain, &pThis->rxFilterMacDefault, sizeof(VIRTIONET_CTRL_MAC_TABLE_LEN));
+            virtioNetR3PullChain(pDevIns, pThis, pDescChain, &pThis->rxFilterMacDefault, sizeof(VIRTIONET_CTRL_MAC_TABLE_LEN));
             break;
         }
@@ -1646 +1653 @@
             /* Load unicast MAC filter table */
             ASSERT_CTRL_TABLE_SET(cbRemaining >= sizeof(cMacs));
-            virtioNetR3PullChain(pDevIns, pDescChain, &cMacs, sizeof(cMacs));
+            virtioNetR3PullChain(pDevIns, pThis, pDescChain, &cMacs, sizeof(cMacs));
             cbRemaining -= sizeof(cMacs);
-            Log6Func(("Guest provided %d unicast MAC Table entries\n", cMacs));
+            Log6Func(("%s Guest provided %d unicast MAC Table entries\n", INSTANCE(pThis), cMacs));
             if (cMacs)
             {
                 uint32_t cbMacs = cMacs * sizeof(RTMAC);
                 ASSERT_CTRL_TABLE_SET(cbRemaining >= cbMacs);
-                virtioNetR3PullChain(pDevIns, pDescChain, &pThis->aMacUnicastFilter, cbMacs);
+                virtioNetR3PullChain(pDevIns, pThis, pDescChain, &pThis->aMacUnicastFilter, cbMacs);
                 cbRemaining -= cbMacs;
             }
@@ -1660 +1667 @@
             /* Load multicast MAC filter table */
             ASSERT_CTRL_TABLE_SET(cbRemaining >= sizeof(cMacs));
-            virtioNetR3PullChain(pDevIns, pDescChain, &cMacs, sizeof(cMacs));
+            virtioNetR3PullChain(pDevIns, pThis, pDescChain, &cMacs, sizeof(cMacs));
             cbRemaining -= sizeof(cMacs);
-            Log6Func(("Guest provided %d multicast MAC Table entries\n", cMacs));
+            Log6Func(("%s Guest provided %d multicast MAC Table entries\n", INSTANCE(pThis), cMacs));
             if (cMacs)
             {
                 uint32_t cbMacs = cMacs * sizeof(RTMAC);
                 ASSERT_CTRL_TABLE_SET(cbRemaining >= cbMacs);
-                virtioNetR3PullChain(pDevIns, pDescChain, &pThis->aMacMulticastFilter, cbMacs);
+                virtioNetR3PullChain(pDevIns, pThis, pDescChain, &pThis->aMacMulticastFilter, cbMacs);
                 cbRemaining -= cbMacs;
             }
@@ -1673 +1680 @@
 
 #ifdef LOG_ENABLED
-            LogFunc(("%s: unicast MACs:\n", INSTANCE(pThis)));
+            LogFunc(("%s unicast MACs:\n", INSTANCE(pThis)));
             for(unsigned i = 0; i < cMacs; i++)
                 LogFunc(("         %RTmac\n", &pThis->aMacUnicastFilter[i]));
 
-            LogFunc(("%s: multicast MACs:\n", INSTANCE(pThis)));
+            LogFunc(("%s multicast MACs:\n", INSTANCE(pThis)));
             for(unsigned i = 0; i < cMacs; i++)
-                LogFunc(("         %RTmac\n", &pThis->aMacUnicastFilter[i]));
+                LogFunc(("         %RTmac\n", &pThis->aMacMulticastFilter[i]));
 #endif
 
@@ -1690 +1697 @@
                                    PVIRTIONET_CTRL_HDR_T pCtrlPktHdr, PVIRTIO_DESC_CHAIN_T pDescChain)
 {
-    LogFunc(("Processing CTRL VLAN command\n"));
+    LogFunc(("%s Processing CTRL VLAN command\n", INSTANCE(pThis)));
 
     RT_NOREF(pThisCC);
@@ -1698 +1705 @@
     AssertMsgReturn(cbRemaining > sizeof(uVlanId),
         ("DESC chain too small for VIRTIO_NET_CTRL_VLAN cmd processing"), VIRTIONET_ERROR);
-    virtioNetR3PullChain(pDevIns, pDescChain, &uVlanId, sizeof(uVlanId));
+    virtioNetR3PullChain(pDevIns, pThis, pDescChain, &uVlanId, sizeof(uVlanId));
     AssertMsgReturn(uVlanId > VIRTIONET_MAX_VLAN_ID,
         ("%s VLAN ID out of range (VLAN ID=%u)\n", INSTANCE(pThis), uVlanId), VIRTIONET_ERROR);
-    LogFunc(("%s: uCommand=%u VLAN ID=%u\n", INSTANCE(pThis), pCtrlPktHdr->uCmd, uVlanId));
+    LogFunc(("%s uCommand=%u VLAN ID=%u\n", INSTANCE(pThis), pCtrlPktHdr->uCmd, uVlanId));
     switch (pCtrlPktHdr->uCmd)
     {
@@ -1719 +1726 @@
                             PVIRTIO_DESC_CHAIN_T pDescChain)
 {
-    LogFunc(("Received CTRL packet from guest\n"));
+    LogFunc(("%s Received CTRL packet from guest\n", INSTANCE(pThis)));
 
     if (pDescChain->cbPhysSend < 2)
     {
-        LogFunc(("ctrl packet from guest driver incomplete. Skipping ctrl cmd\n"));
+        LogFunc(("%s CTRL packet from guest driver incomplete. Skipping ctrl cmd\n", INSTANCE(pThis)));
         return;
     }
     else if (pDescChain->cbPhysReturn < sizeof(VIRTIONET_CTRL_HDR_T_ACK))
     {
-        LogFunc(("Guest driver didn't allocate memory to receive ctrl pkt ACK. Skipping ctrl cmd\n"));
+        LogFunc(("%s Guest driver didn't allocate memory to receive ctrl pkt ACK. Skipping ctrl cmd\n", INSTANCE(pThis)));
         return;
     }
@@ -1742 +1749 @@
                         ("DESC chain too small for CTRL pkt header"));
 
-    virtioNetR3PullChain(pDevIns, pDescChain, pCtrlPktHdr,
+    virtioNetR3PullChain(pDevIns, pThis, pDescChain, pCtrlPktHdr,
                          RT_MIN(pDescChain->cbPhysSend, sizeof(VIRTIONET_CTRL_HDR_T)));
 
-    Log6Func(("CTRL pkt hdr: class=%d cmd=%d\n", pCtrlPktHdr->uClass, pCtrlPktHdr->uCmd));
+    Log6Func(("%s CTRL COMMAND: class=%d command=%d\n", INSTANCE(pThis), pCtrlPktHdr->uClass, pCtrlPktHdr->uCmd));
 
     uint8_t uAck;
@@ -1763 +1770 @@
             if (FEATURE_DISABLED(STATUS) || FEATURE_DISABLED(GUEST_ANNOUNCE))
             {
-                LogFunc(("Ignoring CTRL class VIRTIONET_CTRL_ANNOUNCE. Not configured to handle it\n"));
+                LogFunc(("%s Ignoring CTRL class VIRTIONET_CTRL_ANNOUNCE. Not configured to handle it\n", INSTANCE(pThis)));
                 virtioNetPrintFeatures(pThis, pThis->fNegotiatedFeatures, "Features");
                 break;
@@ -1769 +1776 @@
             if (pCtrlPktHdr->uCmd != VIRTIONET_CTRL_ANNOUNCE_ACK)
             {
-                LogFunc(("Ignoring CTRL class VIRTIONET_CTRL_ANNOUNCE. Unrecognized uCmd\n"));
+                LogFunc(("%s Ignoring CTRL class VIRTIONET_CTRL_ANNOUNCE. Unrecognized uCmd\n", INSTANCE(pThis)));
                 break;
             }
             pThis->virtioNetConfig.uStatus &= ~VIRTIONET_F_ANNOUNCE;
-            Log6Func(("Clearing VIRTIONET_F_ANNOUNCE in config status\n"));
+            Log6Func(("%s Clearing VIRTIONET_F_ANNOUNCE in config status\n", INSTANCE(pThis)));
             break;
 
@@ -1815 +1822 @@
     RTMemFree(pReturnSegBuf);
 
-    LogFunc(("Processed ctrl message class/cmd = %u/%u. Ack=%u.\n",
-              pCtrlPktHdr->uClass, pCtrlPktHdr->uCmd, uAck));
+    LogFunc(("%s Finished processing CTRL command with status %s\n",
+             INSTANCE(pThis), uAck == VIRTIONET_OK ? "VIRTIONET_OK" : "VIRTIONET_ERROR"));
 
 }
@@ -1876 +1883 @@
         //if (pGso->cbHdrs < pPktHdr->uCSumStart + pPktHdr->uCSumOffset + 2)
         {
-            Log4Func(("%s: HdrLen before adjustment %d.\n",
+            Log4Func(("%s HdrLen before adjustment %d.\n",
                   INSTANCE(pThis), pGso->cbHdrsTotal));
             switch (pGso->u8Type)
@@ -1894 +1901 @@
             ((PPDMNETWORKGSO)pSgBuf->pvUser)->cbHdrsTotal = pGso->cbHdrsTotal;
             ((PPDMNETWORKGSO)pSgBuf->pvUser)->cbHdrsSeg   = pGso->cbHdrsSeg;
-            Log4Func(("%s: adjusted HdrLen to %d.\n",
+            Log4Func(("%s adjusted HdrLen to %d.\n",
                   INSTANCE(pThis), pGso->cbHdrsTotal));
         }
-        Log2Func(("%s: gso type=%x cbHdrsTotal=%u cbHdrsSeg=%u mss=%u off1=0x%x off2=0x%x\n",
+        Log2Func(("%s gso type=%x cbHdrsTotal=%u cbHdrsSeg=%u mss=%u off1=0x%x off2=0x%x\n",
                   INSTANCE(pThis), pGso->u8Type, pGso->cbHdrsTotal, pGso->cbHdrsSeg,
                   pGso->cbMaxSeg, pGso->offHdr1, pGso->offHdr2));
@@ -1928 +1935 @@
     if (!pThis->fVirtioReady)
     {
-        LogFunc(("%s Ignoring transmit requests. VirtIO not ready (status=0x%x).\n",
+        LogFunc(("%s Ignoring Tx requests. VirtIO not ready (status=0x%x).\n",
                 INSTANCE(pThis), pThis->virtioNetConfig.uStatus));
         return;
@@ -1953 +1960 @@
     unsigned int cbPktHdr = sizeof(VIRTIONET_PKT_HDR_T);
 
-    Log3Func(("%s: About to transmit %d pending packets\n", INSTANCE(pThis),
+    Log3Func(("%s About to transmit %d pending packets\n", INSTANCE(pThis),
               virtioCoreR3QueuePendingCount(pVirtio->pDevIns, pVirtio, idxQueue)));
 
@@ -1963 +1970 @@
     {
         if (RT_SUCCESS(rc))
-            Log6Func(("fetched descriptor chain from %s\n", VIRTQNAME(idxQueue)));
+            Log6Func(("%s fetched descriptor chain from %s\n", INSTANCE(pThis), VIRTQNAME(idxQueue)));
         else
         {
-            LogFunc(("Failed find expected data on %s, rc = %Rrc\n", VIRTQNAME(idxQueue), rc));
+            LogFunc(("%s Failed find expected data on %s, rc = %Rrc\n", INSTANCE(pThis), VIRTQNAME(idxQueue), rc));
             break;
         }
@@ -1977 +1984 @@
             /* This check could be made more complex, because in theory (but not likely nor
              * seen in practice) the first segment could contain header and data. */
-            LogFunc(("%s: The first segment is not the header! (%u < 2 || %u != %u).\n",
+            LogFunc(("%s The first segment is not the header! (%u < 2 || %u != %u).\n",
                  INSTANCE(pThis), cSegsFromGuest, paSegsFromGuest[0].cbSeg, cbPktHdr));
             break;
@@ -1989 +1996 @@
             uSize +=  paSegsFromGuest[i].cbSeg;
 
-        Log5Func(("%s: complete frame is %u bytes.\n", INSTANCE(pThis), uSize));
+        Log5Func(("%s complete frame is %u bytes.\n", INSTANCE(pThis), uSize));
         Assert(uSize <= VIRTIONET_MAX_FRAME_SIZE);
 
@@ -2022 +2029 @@
                 if (RT_FAILURE(rc))
                 {
-                    LogFunc(("Failed to transmit frame, rc = %Rrc\n", rc));
+                    LogFunc(("%s Failed to transmit frame, rc = %Rrc\n", INSTANCE(pThis), rc));
                     pThisCC->pDrv->pfnFreeBuf(pThisCC->pDrv, pSgBufToPdmLeafDevice);
                 }
@@ -2081 +2088 @@
 #endif
 
-    Log6Func(("%s has available buffers\n", VIRTQNAME(idxQueue)));
+    Log6Func(("%s %s has available buffers\n", INSTANCE(pThis), VIRTQNAME(idxQueue)));
 
     if (IS_RX_QUEUE(idxQueue))
     {
-        LogFunc(("%s Receive buffers has been added, waking up receive thread.\n",
+        LogFunc(("%s Receive buffers have been added, waking Rx thread.\n",
             INSTANCE(pThis)));
         virtioNetR3WakeupRxBufWaiter(pDevIns);
@@ -2096 +2103 @@
             if (ASMAtomicReadBool(&pWorkerR3->fSleeping))
             {
-                Log6Func(("waking %s worker.\n", VIRTQNAME(idxQueue)));
+                Log6Func(("%s waking %s worker.\n", INSTANCE(pThis), VIRTQNAME(idxQueue)));
                 int rc = PDMDevHlpSUPSemEventSignal(pDevIns, pWorker->hEvtProcess);
                 AssertRC(rc);
@@ -2118 +2125 @@
         return VINF_SUCCESS;
     }
-    LogFunc(("%s\n", VIRTQNAME(idxQueue)));
+    LogFunc(("%s %s\n", INSTANCE(pThis), VIRTQNAME(idxQueue)));
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
@@ -2130 +2137 @@
             if (!fNotificationSent)
             {
-                Log6Func(("%s worker sleeping...\n", VIRTQNAME(idxQueue)));
+                Log6Func(("%s %s worker sleeping...\n", INSTANCE(pThis), VIRTQNAME(idxQueue)));
                 Assert(ASMAtomicReadBool(&pWorkerR3->fSleeping));
                 int rc = PDMDevHlpSUPSemEventWaitNoResume(pDevIns, pWorker->hEvtProcess, RT_INDEFINITE_WAIT);
@@ -2141 +2148 @@
                     continue;
                 }
-                Log6Func(("%s worker woken\n", VIRTQNAME(idxQueue)));
+                Log6Func(("%s %s worker woken\n", INSTANCE(pThis), VIRTQNAME(idxQueue)));
                 ASMAtomicWriteBool(&pWorkerR3->fNotified, false);
             }
@@ -2154 +2161 @@
              if (IS_CTRL_QUEUE(idxQueue))
              {
-                 Log6Func(("fetching next descriptor chain from %s\n", VIRTQNAME(idxQueue)));
+                 Log6Func(("%s fetching next descriptor chain from %s\n", INSTANCE(pThis), VIRTQNAME(idxQueue)));
                  PVIRTIO_DESC_CHAIN_T pDescChain;
                  int rc = virtioCoreR3QueueGet(pDevIns, &pThis->Virtio, idxQueue, &pDescChain, true);
                  if (rc == VERR_NOT_AVAILABLE)
                  {
-                    Log6Func(("Nothing found in %s\n", VIRTQNAME(idxQueue)));
+                    Log6Func(("%s Nothing found in %s\n", INSTANCE(pThis), VIRTQNAME(idxQueue)));
                     continue;
                  }
@@ -2166 +2173 @@
              else if (IS_TX_QUEUE(idxQueue))
              {
-                 Log6Func(("Notified of data to transmit\n"));
+                 Log6Func(("%s Notified of data to transmit\n", INSTANCE(pThis)));
                  virtioNetR3TransmitPendingPackets(pDevIns, pThis, pThisCC,
                                                    idxQueue, true /* fOnWorkerThread */);
@@ -2184 +2191 @@
     RT_NOREF(pDevIns, pThis, rcBusy);
     /* Original DevVirtioNet uses CS in attach/detach/link-up timer/tx timer/transmit */
-    LogFunc(("CS unimplemented. What does the critical section protect in orig driver??"));
+    LogFunc(("%s CS unimplemented. What does the critical section protect in orig driver??", INSTANCE(pThis)));
     return VINF_SUCCESS;
 }
@@ -2191 +2198 @@
 {
     RT_NOREF(pDevIns, pThis);
-    LogFunc(("CS unimplemented. What does the critical section protect in orig driver??"));
+    LogFunc(("%s CS unimplemented. What does the critical section protect in orig driver??", INSTANCE(pThis)));
 }
 
@@ -2213 +2220 @@
     virtioNetR3CsLeave(pDevIns, pThis);
 
-    LogFunc(("%s: Link is up\n", INSTANCE(pThis)));
+    LogFunc(("%s Link is up\n", INSTANCE(pThis)));
 
     if (pThisCC->pDrv)
@@ -2242 +2249 @@
         AssertRC(rc);
 
-        LogFunc(("%s: Link is down temporarily\n", INSTANCE(pThis)));
+        LogFunc(("%s Link is down temporarily\n", INSTANCE(pThis)));
     }
 }
@@ -2269 +2276 @@
     bool fActiveLinkIsUp = (enmState == PDMNETWORKLINKSTATE_UP);
 
-    LogFunc(("%s: enmState=%d\n", INSTANCE(pThis), enmState));
+    LogFunc(("%s enmState=%d\n", INSTANCE(pThis), enmState));
     if (enmState == PDMNETWORKLINKSTATE_DOWN_RESUME)
     {
@@ -2309 +2316 @@
 static int virtioNetR3DestroyWorkerThreads(PPDMDEVINS pDevIns, PVIRTIONET pThis, PVIRTIONETCC pThisCC)
 {
-    LogFunc(("\n"));
+    LogFunc(("%s\n", INSTANCE(pThis)));
     int rc = VINF_SUCCESS;
     for (unsigned idxQueue = 0; idxQueue < pThis->cVirtQueues; idxQueue++)
@@ -2333 +2340 @@
 static int virtioNetR3CreateWorkerThreads(PPDMDEVINS pDevIns, PVIRTIONET pThis, PVIRTIONETCC pThisCC)
 {
-    LogFunc(("\n"));
+    LogFunc(("%s\n", INSTANCE(pThis)));
 
     int rc = VINF_SUCCESS;
@@ -2371 +2378 @@
     PVIRTIONETCC   pThisCC   = RT_FROM_MEMBER(pVirtioCC, VIRTIONETCC, Virtio);
 
-    LogFunc(("\n"));
+    LogFunc(("%s\n", INSTANCE(pThis)));
 
     pThis->fVirtioReady = fVirtioReady;
@@ -2377 +2384 @@
     if (fVirtioReady)
     {
-        LogFunc(("VirtIO ready\n-----------------------------------------------------------------------------------------\n"));
+        LogFunc(("%s VirtIO ready\n-----------------------------------------------------------------------------------------\n",
+                 INSTANCE(pThis)));
 
         pThis->fResetting    = false;
@@ -2391 +2399 @@
     else
     {
-        LogFunc(("VirtIO is resetting\n"));
+        LogFunc(("%s VirtIO is resetting\n", INSTANCE(pThis)));
 
         pThis->virtioNetConfig.uStatus = pThis->fCableConnected ? VIRTIONET_F_LINK_UP : 0;
@@ -2431 +2439 @@
     PVIRTIONETCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PVIRTIONETCC);
 
-    LogFunc(("\n"));
+    LogFunc(("%s\n", INSTANCE(pThis)));
     AssertLogRelReturnVoid(iLUN == 0);
 
@@ -2458 +2466 @@
     RT_NOREF(fFlags);
 
-    LogFunc(("%s",  INSTANCE(pThis)));
+    LogFunc(("%s", INSTANCE(pThis)));
 
     AssertLogRelReturn(iLUN == 0, VERR_PDM_NO_SUCH_LUN);
@@ -2550 +2558 @@
      */
     LogFunc(("PDM device instance: %d\n", iInstance));
-    RTStrPrintf(INSTANCE(pThis), sizeof(INSTANCE(pThis)), "VIRTIONET%d", iInstance);
+
+
+    RTStrPrintf(pThis->szInstanceName, sizeof(pThis->szInstanceName), "VIRTIONET", iInstance);
+
     pThisCC->pDevIns     = pDevIns;
 
@@ -2614 +2625 @@
     /* Initialize the generic Virtio core: */
     pThisCC->Virtio.pfnStatusChanged        = virtioNetR3StatusChanged;
-    pThisCC->Virtio.pfnQueueNotified        = virtioNetR3QueueNotified;
+    pThisCC->Virtio.pfnQueueNotified        = virtioNetR3QueueNotified
+    ;
     pThisCC->Virtio.pfnDevCapRead           = virtioNetR3DevCapRead;
     pThisCC->Virtio.pfnDevCapWrite          = virtioNetR3DevCapWrite;
@@ -2736 +2748 @@
     /* .uReserved0 = */             0,
     /* .szName = */                 "virtio-net-1-dot-0",
-    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_NEW_STYLE //| PDM_DEVREG_FLAGS_RZ | PDM_DEVREG_FLAGS_NEW_STYLE
+    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_NEW_STYLE //| PDM_DEVREG_FLAGS_RZ
                                     | PDM_DEVREG_FLAGS_FIRST_SUSPEND_NOTIFICATION
                                     | PDM_DEVREG_FLAGS_FIRST_POWEROFF_NOTIFICATION,

trunk/src/VBox/Devices/VirtIO/Virtio_1_0.cpp

@@ -226 +226 @@
 }
 
-DECLINLINE(void) virtioWriteUsedFlags(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, uint16_t idxQueue, uint32_t fFlags)
+DECLINLINE(void) virtioWriteUsedFlags(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, uint16_t idxQueue, uint16_t fFlags)
 {
     AssertMsg(pVirtio->uDeviceStatus & VIRTIO_STATUS_DRIVER_OK, ("Called with guest driver not ready\n"));
@@ -234 +234 @@
                           &fFlags, sizeof(fFlags));
 }
-
 #endif