Changeset 92951 in vbox for trunk

Timestamp:

Dec 15, 2021 9:03:29 PM (3 years ago)

Author:

vboxsync

Message:

Fix error handling bug and a few typos

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet_1_0.cpp (modified) (4 diffs)
• VirtIO/VirtioCore.h (modified) (2 diffs)

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

@@ -1968 +1968 @@
     /*
      * Try to do fast (e.g. single-buffer) copy to guest, even if MRG_RXBUF feature is enabled
-     * If
      */
     STAM_PROFILE_START(&pThis->StatReceiveStore, a);
@@ -1977 +1976 @@
         pRxPktHdr->uNumBuffers = 1;
         rc = virtioCoreR3VirtqUsedBufPut(pDevIns, &pThis->Virtio, pRxVirtq->uIdx, cbPktHdr,  pRxPktHdr, pVirtqBuf, 0  /* cbEnqueue */);
-        AssertMsgReturn(rc == VINF_SUCCESS, ("%Rrc\n", rc), rc);
-        rc = virtioCoreR3VirtqUsedBufPut(pDevIns, &pThis->Virtio, pRxVirtq->uIdx, cb, pvBuf, pVirtqBuf, cbPktHdr + cb /* cbEnqueue */);
-        AssertMsgReturn(rc == VINF_SUCCESS, ("%Rrc\n", rc), rc);
+        if (rc == VINF_SUCCESS)
+            rc = virtioCoreR3VirtqUsedBufPut(pDevIns, &pThis->Virtio, pRxVirtq->uIdx, cb, pvBuf, pVirtqBuf, cbPktHdr + cb /* cbEnqueue */);
         virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf);
         virtioCoreVirtqUsedRingSync(pDevIns, &pThis->Virtio, pRxVirtq->uIdx);
+        AssertMsgReturn(rc == VINF_SUCCESS, ("%Rrc\n", rc), rc);
     }
     else
@@ -2373 +2372 @@
  * This function handles all parts of the host-side of the ctrlq round-trip buffer processing.
  *
- * Invoked by worker for virtio-net defince control queue to process a queued control command buffer.
+ * Invoked by worker for virtio-net control queue to process a queued control command buffer.
  *
  * @param pDevIns       PDM device instance
@@ -3327 +3326 @@
  * Case in point: According to VirtIO 0.95 ("legacy") specification, section 2.2.1, "historically"
  * drivers may start driving prior to feature negotiation and prior to drivers setting DRIVER_OK
- * status, "provided driver doesn't use features that alter early use of this device".  That
- * is Interpreted here to mean a virtio-net driver must respect default settings (such as implicit
- * pkt header default size, as determined per Note 1 below).
+ * status, "provided driver doesn't use features that alter early use of this device".  Interpreted
+ * here to mean a virtio-net driver must respect default settings (such as implicit pkt header default
+ * size, as determined per Note 1 below).
  *
  * ----------------------------------------------------------------------------------------------

trunk/src/VBox/Devices/VirtIO/VirtioCore.h

@@ -619 +619 @@
 
 /**
- * Displays a well-formated human-readable translation of otherwise inscrutable bitmasks
+ * Displays a well-formatted human-readable translation of otherwise inscrutable bitmasks
  * that embody features VirtIO specification definitions, indicating: Totality of features
  * that can be implemented by host and guest, which features were offered by the host, and
@@ -821 +821 @@
  * behavioral modeling, indicating guest agreed to comply with the modern VirtIO 1.0+ specification.
  * Otherwise unavoidable presumption is that the host device is dealing with legacy VirtIO
- * guest drive, thus must be prepared to cope with less mature architecture and behaviors
- * from  prototype era of VirtIO. (see comments in PDM-invoked device constructor for more information).
+ * guest driver, thus must be prepared to cope with less mature architecture and behaviors
+ * from prototype era of VirtIO. (see comments in PDM-invoked device constructor for more
+ * information).
  *
  * @param   pVirtio      Pointer to the virtio state.