diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-16 15:51:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-16 15:51:57 -0700 |
| commit | 3ec60b92d3bae719cf3a8b6e522af07ad3d1cc5b (patch) | |
| tree | 194b96f2d90235f8511a125dfe29d8d3d9eed55c /tools/virtio/linux/virtio.h | |
| parent | 45b6ae761e5259d457a797f66f4d4c16b620f268 (diff) | |
| parent | 6be3ffaa0e15c64f560904b025f5c50bef5886f9 (diff) | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio/vhost fixes from Michael Tsirkin:
- test fixes
- a vsock fix
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
tools/virtio: add dma stubs
vhost/test: fix after swiotlb changes
vhost/vsock: drop space available check for TX vq
ringtest: test build fix
Diffstat (limited to 'tools/virtio/linux/virtio.h')
| -rw-r--r-- | tools/virtio/linux/virtio.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/virtio/linux/virtio.h b/tools/virtio/linux/virtio.h index ee125e714053..9377c8b4ac16 100644 --- a/tools/virtio/linux/virtio.h +++ b/tools/virtio/linux/virtio.h @@ -3,8 +3,12 @@ #include <linux/scatterlist.h> #include <linux/kernel.h> +struct device { + void *parent; +}; + struct virtio_device { - void *dev; + struct device dev; u64 features; }; |