Changeset 82559 in vbox for trunk/src/VBox/Devices/VirtIO/Virtio_1_0.cpp

Timestamp:

Dec 12, 2019 6:55:29 AM (5 years ago)

Author:

vboxsync

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

135433

Message:

Storage/DevVirtioSCSI.cpp: Enabled R0, increased req queue count to 4 for potential performance increased, cleaned up some comments and logging

File:

• trunk/src/VBox/Devices/VirtIO/Virtio_1_0.cpp (modified) (5 diffs)

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

@@ -173 +173 @@
     bool fEmpty = uAvailGst == pVirtio->virtqState[idxQueue].uAvailIdx;
 
-    LogFlow(("Q<%u>: uAvailGst=%u uAvailIdx=%u -> fEmpty=%RTbool\n",
+    Log6Func(("Q<%u>: uAvailGst=%u uAvailIdx=%u -> fEmpty=%RTbool\n",
              idxQueue, uAvailGst, pVirtio->virtqState[idxQueue].uAvailIdx, fEmpty));
     return fEmpty;
@@ -788 +788 @@
     virtioWriteUsedElem(pDevIns, pVirtio, idxQueue, pVirtq->uUsedIdx++, pDescChain->uHeadIdx, (uint32_t)cbCopy);
 
-    Log2Func((".... Copied %zu bytes to %u byte buffer, residual=%zu\n",
+    Log3Func((".... Copied %zu bytes to %u byte buffer, residual=%zu\n",
               cbCopy, pDescChain->cbPhysReturn, pDescChain->cbPhysReturn - cbCopy));
 
@@ -951 +951 @@
 }
 
+
+
+/**
+ * Initiate orderly reset procedure. This is an exposed API for clients that might need it.
+ * Invoked by client to reset the device and driver (see VirtIO 1.0 section 2.1.1/2.1.2)
+ */
+void virtioCoreResetAll(PVIRTIOCORE pVirtio)
+{
+    LogFunc(("\n"));
+    pVirtio->uDeviceStatus |= VIRTIO_STATUS_DEVICE_NEEDS_RESET;
+    if (pVirtio->uDeviceStatus & VIRTIO_STATUS_DRIVER_OK)
+    {
+        pVirtio->fGenUpdatePending = true;
+        virtioKick(pVirtio->pDevIns, pVirtio, VIRTIO_ISR_DEVICE_CONFIG, pVirtio->uMsixConfig, false /* fForce */);
+    }
+}
+
+#ifdef IN_RING3
 static void virtioResetQueue(PVIRTIOCORE pVirtio, uint16_t idxQueue)
 {
@@ -996 +1014 @@
 }
 
-/**
- * Initiate orderly reset procedure. This is an exposed API for clients that might need it.
- * Invoked by client to reset the device and driver (see VirtIO 1.0 section 2.1.1/2.1.2)
- */
-void virtioCoreResetAll(PVIRTIOCORE pVirtio)
-{
-    LogFunc(("\n"));
-    pVirtio->uDeviceStatus |= VIRTIO_STATUS_DEVICE_NEEDS_RESET;
-    if (pVirtio->uDeviceStatus & VIRTIO_STATUS_DRIVER_OK)
-    {
-        pVirtio->fGenUpdatePending = true;
-        virtioKick(pVirtio->pDevIns, pVirtio, VIRTIO_ISR_DEVICE_CONFIG, pVirtio->uMsixConfig, false /* fForce */);
-    }
-}
-
-#ifdef IN_RING3
 /**
  * Invoked by this implementation when guest driver resets the device.
@@ -1895 +1897 @@
     /* Set offset to first capability and enable PCI dev capabilities */
     PDMPciDevSetCapabilityList(pPciDev, 0x40);
-    PDMPciDevSetStatus(pPciDev,         VBOX_PCI_STATUS_CAP_LIST);
+    PDMPciDevSetStatus(pPciDev, VBOX_PCI_STATUS_CAP_LIST);
 
     /* Linux drivers/virtio/virtio_pci_modern.c tries to map at least a page for the