diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /tools/virtio | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'tools/virtio')
| -rw-r--r-- | tools/virtio/virtio_test.c | 6 | ||||
| -rw-r--r-- | tools/virtio/vringh_test.c | 13 |
2 files changed, 6 insertions, 13 deletions
diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c index bdb71a2..da7a195 100644 --- a/tools/virtio/virtio_test.c +++ b/tools/virtio/virtio_test.c @@ -41,14 +41,13 @@ struct vdev_info { struct vhost_memory *mem; }; -bool vq_notify(struct virtqueue *vq) +void 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) @@ -172,8 +171,7 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq, GFP_ATOMIC); if (likely(r == 0)) { ++started; - if (unlikely(!virtqueue_kick(vq->vq)) - r = -1; + virtqueue_kick(vq->vq); } } else r = -1; diff --git a/tools/virtio/vringh_test.c b/tools/virtio/vringh_test.c index 14a4f4c..d053ea4 100644 --- a/tools/virtio/vringh_test.c +++ b/tools/virtio/vringh_test.c @@ -22,7 +22,7 @@ static u64 user_addr_offset; #define RINGSIZE 256 #define ALIGN 4096 -static bool never_notify_host(struct virtqueue *vq) +static void never_notify_host(struct virtqueue *vq) { abort(); } @@ -65,22 +65,17 @@ struct guest_virtio_device { unsigned long notifies; }; -static bool parallel_notify_host(struct virtqueue *vq) +static void parallel_notify_host(struct virtqueue *vq) { - int rc; struct guest_virtio_device *gvdev; gvdev = container_of(vq->vdev, struct guest_virtio_device, vdev); - rc = write(gvdev->to_host_fd, "", 1); - if (rc < 0) - return false; + write(gvdev->to_host_fd, "", 1); gvdev->notifies++; - return true; } -static bool no_notify_host(struct virtqueue *vq) +static void no_notify_host(struct virtqueue *vq) { - return true; } #define NUM_XFERS (10000000) |