diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 09:46:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 09:46:45 -0700 |
| commit | ecaba7185894778c24895356d117a7f92e3c92de (patch) | |
| tree | 03567db9d31a453f4262c923c9717e4d394e6881 /tools/virtio/ringtest/main.c | |
| parent | e989cc564691901d42e957059592fe3e7b6893fc (diff) | |
| parent | bb991288728e6a47a6f0fac6a4e9dfaeecc27956 (diff) | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin:
"Looks like a quiet cycle for virtio. There's a new inorder option for
the ringtest tool, and a bugfix for balloon for ppc platforms when
using virtio 1 mode"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
ringtest: pass buf != NULL
virtio_balloon: fix PFN format for virtio-1
virtio: add inorder option
Diffstat (limited to 'tools/virtio/ringtest/main.c')
| -rw-r--r-- | tools/virtio/ringtest/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/virtio/ringtest/main.c b/tools/virtio/ringtest/main.c index 3a5ff438bd62..147abb452a6c 100644 --- a/tools/virtio/ringtest/main.c +++ b/tools/virtio/ringtest/main.c @@ -115,7 +115,7 @@ static void run_guest(void) do { if (started < bufs && started - completed < max_outstanding) { - r = add_inbuf(0, NULL, "Hello, world!"); + r = add_inbuf(0, "Buffer\n", "Hello, world!"); if (__builtin_expect(r == 0, true)) { ++started; if (!--tokick) { |