Changeset 71788 in vbox for trunk/src/VBox/Devices/VirtIO

Timestamp:

Apr 9, 2018 4:06:34 PM (7 years ago)

Author:

vboxsync

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

121891

Message:

DevVirtioNet: A couple of todos and paranoia.

File:

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

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

@@ -165 +165 @@
             break;
         }
+        RT_UNTRUSTED_VALIDATED_FENCE();
 
         vringReadDesc(pState, &pQueue->VRing, idx, &desc);
@@ -551 +552 @@
             u32 &= 0xFFFF;
             if (u32 < pState->nQueues)
+            {
+                RT_UNTRUSTED_VALIDATED_FENCE();
                 if (pState->Queues[u32].VRing.addrDescriptors)
                 {
@@ -563 +566 @@
                     Log(("%s The queue (#%d) being notified has not been initialized.\n",
                          INSTANCE(pState), u32));
+            }
             else
                 Log(("%s Invalid queue number (%d)\n", INSTANCE(pState), u32));
@@ -799 +803 @@
         else
             pState->nQueues = nQueues;
+        AssertLogRelMsgReturn(pState->nQueues <= VIRTIO_MAX_NQUEUES, ("%#x\n", pState->nQueues), VERR_SSM_LOAD_CONFIG_MISMATCH);
+        AssertLogRelMsgReturn(pState->uQueueSelector < pState->nQueues || (pState->nQueues == 0 && pState->uQueueSelector),
+                              ("uQueueSelector=%u nQueues=%u\n", pState->uQueueSelector, pState->nQueues),
+                              VERR_SSM_LOAD_CONFIG_MISMATCH);
+
         for (unsigned i = 0; i < pState->nQueues; i++)
         {
@@ -1010 +1019 @@
 
 #endif /* VBOX_DEVICE_STRUCT_TESTCASE */
+