Pull virtio fixes from Michael Tsirkin: "A small fix for a uapi header, and a fix for VDPA for non-x86 guests" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio: drop internal struct from UAPI virtio: support VIRTIO_F_ORDER_PLATFORM
Showing the changes to include/uapi/linux (2 of 3 files). Show all
Unified · Split
| @@ -78,6 +78,12 @@ · 77 unmodified lines | ||
| 78 | 78 | /* This feature indicates support for the packed virtqueue layout. */ |
| 79 | 79 | #define VIRTIO_F_RING_PACKED 34 |
| 80 | 80 | |
| 81 | +/* | |
| 82 | + * This feature indicates that memory accesses by the driver and the | |
| 83 | + * device are ordered in a way described by the platform. | |
| 84 | + */ | |
| 85 | +#define VIRTIO_F_ORDER_PLATFORM 36 | |
| 86 | + | |
| 81 | 87 | /* |
| 82 | 88 | * Does the device support Single Root I/O Virtualization? |
| 83 | 89 | */ |
| @@ -213,14 +213,4 @@ struct vring_packed_desc { · 212 unmodified lines | ||
| 213 | 213 | __le16 flags; |
| 214 | 214 | }; |
| 215 | 215 | |
| 216 | −struct vring_packed { | |
| 217 | − unsigned int num; | |
| 218 | − | |
| 219 | − struct vring_packed_desc *desc; | |
| 220 | − | |
| 221 | − struct vring_packed_desc_event *driver; | |
| 222 | − | |
| 223 | − struct vring_packed_desc_event *device; | |
| 224 | −}; | |
| 225 | − | |
| 226 | 216 | #endif /* _UAPI_LINUX_VIRTIO_RING_H */ |