virtio-rng: ask for more data if queue is not fully drained
authorLadi Prosek <lprosek@redhat.com>
Thu, 3 Mar 2016 09:48:34 +0000 (10:48 +0100)
committerAmit Shah <amit.shah@redhat.com>
Thu, 3 Mar 2016 12:12:26 +0000 (17:42 +0530)
This commit effectively reverts:

  commit 4621c1768ef5d12171cca2aa1473595ecb9f1c9e
  Author: Amit Shah <amit.shah@redhat.com>
  Date:   Wed Nov 21 11:21:19 2012 +0530

  virtio-rng: remove extra request for entropy

but instead of calling virtio_rng_process unconditionally, it
first checks to see if the queue is empty as a little bit of
optimization.

Signed-off-by: Ladi Prosek <lprosek@redhat.com>
Reviewed-by: Amit Shah <amit.shah@redhat.com>
Message-Id: <1456998514-19271-1-git-send-email-lprosek@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
hw/virtio/virtio-rng.c

index 17da2f8f3d6587028c9ef7fe4f2585b56b827907..d7134646e225474f1e5d3ebefad6188fd7b87007 100644 (file)
@@ -69,6 +69,13 @@ static void chr_read(void *opaque, const void *buf, size_t size)
         g_free(elem);
     }
     virtio_notify(vdev, vrng->vq);
+
+    if (!virtio_queue_empty(vrng->vq)) {
+        /* If we didn't drain the queue, call virtio_rng_process
+         * to take care of asking for more data as appropriate.
+         */
+        virtio_rng_process(vrng);
+    }
 }
 
 static void virtio_rng_process(VirtIORNG *vrng)