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

Timestamp:

Dec 15, 2021 8:52:05 PM (3 years ago)

Author:

vboxsync

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

148925

Message:

VirtioCore: VIRTIOCORER3::pfnFeatureNegotiationComplete must be optional as DevVirtioSCSI doesn't set it. bugref:8651

Location:

trunk/src/VBox/Devices/VirtIO

Files:

• VirtioCore.cpp (modified) (2 diffs)
• VirtioCore.h (modified) (4 diffs)

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

@@ -1302 +1302 @@
                 AssertMsgFailed(("Guest didn't accept VIRTIO_F_VERSION_1, but fLegacyOffered flag not set.\n"));
         }
-        pVirtioCC->pfnFeatureNegotiationComplete(pVirtio, pVirtio->uDriverFeatures, pVirtio->fLegacyDriver);
+        if (pVirtioCC->pfnFeatureNegotiationComplete)
+            pVirtioCC->pfnFeatureNegotiationComplete(pVirtio, pVirtio->uDriverFeatures, pVirtio->fLegacyDriver);
         pVirtio->fDriverFeaturesWritten |= DRIVER_FEATURES_COMPLETE_HANDLED;
 }
@@ -2347 +2348 @@
     AssertReturn(pVirtioCC->pfnStatusChanged, VERR_INVALID_POINTER);
     AssertReturn(pVirtioCC->pfnVirtqNotified, VERR_INVALID_POINTER);
-    AssertReturn(pVirtioCC->pfnFeatureNegotiationComplete,  VERR_INVALID_POINTER);
     AssertReturn(VIRTQ_SIZE > 0 && VIRTQ_SIZE <= 32768,  VERR_OUT_OF_RANGE); /* VirtIO specification-defined limit */
 

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

@@ -390 +390 @@
      * @{  */
     /**
-     * Implementation-specific client callback to report VirtIO when feature negotiation is
-     * complete. It should be invoked by the VirtIO core only once.
+     * Implementation-specific client callback to report VirtIO when feature
+     * negotiation is complete, optional.
+     *
+     * It should be invoked by the VirtIO core only once.
      *
      * @param   pVirtio           Pointer to the shared virtio state.
@@ -412 +414 @@
 
     /**
-     * Implementation-specific client callback to access VirtIO Device-specific capabilities
-     * (other VirtIO capabilities and features are handled in VirtIO implementation)
+     * Implementation-specific client callback to access VirtIO Device-specific
+     * capabilities (other VirtIO capabilities and features are handled in VirtIO
+     * implementation).
      *
      * @param   pDevIns    The device instance.
@@ -423 +426 @@
 
     /**
-     * Implementation-specific client callback to access VirtIO Device-specific capabilities
-     * (other VirtIO capabilities and features are handled in VirtIO implementation)
+     * Implementation-specific client callback to access VirtIO Device-specific
+     * capabilities (other VirtIO capabilities and features are handled in VirtIO
+     * implementation).
      *
      * @param   pDevIns    The device instance.
@@ -434 +438 @@
 
     /**
-     * When guest-to-host queue notifications are enabled, the guest driver notifies the host
-     * that the avail queue has buffers, and this callback informs the client.
+     * When guest-to-host queue notifications are enabled, the guest driver notifies
+     * the host that the avail queue has buffers, and this callback informs the
+     * client.
      *
      * @param   pVirtio    Pointer to the shared virtio state.