Pull virtio updates from Michael Tsirkin: - enable packed ring support for s390 - several fixes * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio/s390: enable packed ring virtio/s390: DMA support for virtio-ccw virtio/s390: use vring_create_virtqueue virtio/virtio_ring: do some comment fixes vhost-scsi: remove incorrect memory barrier tools/virtio/ringtest: Remove bogus definition of BUG_ON() virtio_ring: Fix potential mem leak in virtqueue_add_indirect_packed
Showing the changes to include/linux (1 of 5 files). Show all
Unified · Split
| @@ -90,23 +90,6 @@ dma_addr_t virtqueue_get_desc_addr(struct virtqueue *vq); · 89 unmodified lines | |||
| 90 | dma_addr_t virtqueue_get_avail_addr(struct virtqueue *vq); | 90 | dma_addr_t virtqueue_get_avail_addr(struct virtqueue *vq); |
| 91 | dma_addr_t virtqueue_get_used_addr(struct virtqueue *vq); | 91 | dma_addr_t virtqueue_get_used_addr(struct virtqueue *vq); |
| 92 | 92 | ||
| 93 | /* | ||
| 94 | * Legacy accessors -- in almost all cases, these are the wrong functions | ||
| 95 | * to use. | ||
| 96 | */ | ||
| 97 | static inline void *virtqueue_get_desc(struct virtqueue *vq) | ||
| 98 | { | ||
| 99 | return virtqueue_get_vring(vq)->desc; | ||
| 100 | } | ||
| 101 | static inline void *virtqueue_get_avail(struct virtqueue *vq) | ||
| 102 | { | ||
| 103 | return virtqueue_get_vring(vq)->avail; | ||
| 104 | } | ||
| 105 | static inline void *virtqueue_get_used(struct virtqueue *vq) | ||
| 106 | { | ||
| 107 | return virtqueue_get_vring(vq)->used; | ||
| 108 | } | ||
| 109 | |||
| 110 | /** | 93 | /** |
| 111 | * virtio_device - representation of a device using virtio | 94 | * virtio_device - representation of a device using virtio |
| 112 | * @index: unique position on the virtio bus | 95 | * @index: unique position on the virtio bus |