Changeset ee0c03a in mainline for uspace/lib/virtio/virtio.c

Timestamp:

2018-05-22T19:06:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5b5c286

Parents:

7bf16b7e

git-author:

Jakub Jermar <jakub@…> (2018-05-20 10:33:15)

git-committer:

Jakub Jermar <jakub@…> (2018-05-22 19:06:50)

Message:

Require at least the specified queue size

File:

• uspace/lib/virtio/virtio.c (modified) (1 diff)

uspace/lib/virtio/virtio.c

@@ -47 +47 @@
 
         /* Trim the size of the queue as needed */
-        size = min(pio_read_16(&cfg->queue_size), size);
+        if (size > pio_read_16(&cfg->queue_size)) {
+                ddf_msg(LVL_ERROR, "Virtq %u: not enough descriptors", num);
+                return ENOMEM;
+        }
         pio_write_16(&cfg->queue_size, size);
-        ddf_msg(LVL_NOTE, "Virtq %u: %u buffers", num, (unsigned) size);
+        ddf_msg(LVL_NOTE, "Virtq %u: %u descriptors", num, (unsigned) size);
 
         size_t avail_offset = 0;