Merge branches 'pm-cpuidle' and 'pm-cpufreq'

[firefly-linux-kernel-4.4.55.git] / tools / virtio / virtio_test.c

diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c
index da7a19558281637789bd932614861cc10c15d692..bdb71a26ae35d7d058f87fa94e6bf2e39e558015 100644 (file)
--- a/tools/virtio/virtio_test.c
+++ b/tools/virtio/virtio_test.c
@@ -41,13 +41,14 @@ struct vdev_info {
        struct vhost_memory *mem;
 };
 
-void vq_notify(struct virtqueue *vq)
+bool vq_notify(struct virtqueue *vq)
 {
        struct vq_info *info = vq->priv;
        unsigned long long v = 1;
        int r;
        r = write(info->kick, &v, sizeof v);
        assert(r == sizeof v);
+       return true;
 }
 
 void vq_callback(struct virtqueue *vq)
@@ -171,7 +172,8 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq,
                                                         GFP_ATOMIC);
                                if (likely(r == 0)) {
                                        ++started;
-                                       virtqueue_kick(vq->vq);
+                                       if (unlikely(!virtqueue_kick(vq->vq))
+                                               r = -1;
                                }
                        } else
                                r = -1;