Changeset 95609 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jul 12, 2022 8:28:41 PM (3 years ago)

Author:

vboxsync

Message:

Devices/DevVirtioNet_1_0: Fix legacy 32-bit guest compatibility. bugref:8651

File:

• trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp (modified) (4 diffs)

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

@@ -1016 +1016 @@
 #if FEATURE_OFFERED(STATUS)
     else
-    if (VIRTIO_DEV_CONFIG_MATCH_MEMBER(    uStatus,          VIRTIONET_CONFIG_T, uOffsetOfAccess))
+    if (VIRTIO_DEV_CONFIG_SUBMATCH_MEMBER( uStatus,          VIRTIONET_CONFIG_T, uOffsetOfAccess))
         VIRTIO_DEV_CONFIG_ACCESS_READONLY( uStatus,          VIRTIONET_CONFIG_T, uOffsetOfAccess, &pThis->virtioNetConfig);
 #endif
@@ -1199 +1199 @@
          */
         pThis->fNegotiatedFeatures = virtioCoreGetNegotiatedFeatures(&pThis->Virtio);
+        /* @todo: shouldn't we update the virtio header size here? it depends on the negotiated features. */
         virtioCorePrintDeviceFeatures(&pThis->Virtio, NULL, s_aDevSpecificFeatures, RT_ELEMENTS(s_aDevSpecificFeatures));
 
@@ -3223 +3224 @@
         pThis->fResetting = false;
         pThis->fNegotiatedFeatures = virtioCoreGetNegotiatedFeatures(pVirtio);
+        /* Now we can properly figure out the size of virtio header! */
+        virtioNetConfigurePktHdr(pThis, pThis->Virtio.fLegacyDriver);
         pThis->virtioNetConfig.uStatus = pThis->fCableConnected ? VIRTIONET_F_LINK_UP : 0;
 
@@ -3550 +3553 @@
 
     pThis->fNegotiatedFeatures = virtioCoreGetNegotiatedFeatures(&pThis->Virtio);
+    /* @todo: validating features at this point is most probably pointless, as the negotiation hasn't started yet. */
     if (!virtioNetValidateRequiredFeatures(pThis->fNegotiatedFeatures))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("virtio-net: Required features not successfully negotiated."));