Index: uspace/lib/virtio/virtio.c
===================================================================
--- uspace/lib/virtio/virtio.c	(revision 0180c67e7c9f9c483ace0ebeccadc52c8892c1df)
+++ uspace/lib/virtio/virtio.c	(revision ee0c03a8649676f1ba3c2dfe2fbc0aef7550b571)
@@ -47,7 +47,10 @@
 
 	/* 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;