diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-15 14:50:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-15 14:50:10 -0700 |
commit | 3b1f00aceb7a67bf079a5a64aa5c6baf78a8f442 (patch) | |
tree | c0ae4d9f2052bd3d7ebd5be3a503c97fb5c0a4a1 /tools | |
parent | 8625732e7712882bd14e1fce962bdc3c315acd41 (diff) | |
parent | 245cdd9fbd396483d501db83047116e2530f245f (diff) |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fixes from Michael Tsirkin:
"Some minor bugfixes"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
vhost/test: stop device before reset
tools/virtio: xen stub
tools/virtio: more stubs
Diffstat (limited to 'tools')
-rw-r--r-- | tools/virtio/crypto/hash.h | 0 | ||||
-rw-r--r-- | tools/virtio/linux/dma-mapping.h | 2 | ||||
-rw-r--r-- | tools/virtio/xen/xen.h | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/tools/virtio/crypto/hash.h b/tools/virtio/crypto/hash.h new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/tools/virtio/crypto/hash.h diff --git a/tools/virtio/linux/dma-mapping.h b/tools/virtio/linux/dma-mapping.h index f91aeb5fe571..8f41cd6bd5c0 100644 --- a/tools/virtio/linux/dma-mapping.h +++ b/tools/virtio/linux/dma-mapping.h @@ -29,4 +29,6 @@ enum dma_data_direction { #define dma_unmap_single(...) do { } while (0) #define dma_unmap_page(...) do { } while (0) +#define dma_max_mapping_size(...) SIZE_MAX + #endif diff --git a/tools/virtio/xen/xen.h b/tools/virtio/xen/xen.h new file mode 100644 index 000000000000..f569387d1403 --- /dev/null +++ b/tools/virtio/xen/xen.h @@ -0,0 +1,6 @@ +#ifndef XEN_XEN_STUB_H +#define XEN_XEN_STUB_H + +#define xen_domain() 0 + +#endif |