Pull virtio fixes from Michael Tsirkin: "A small number of fixes: - virtgpu is exempt from reset shutdown fow now - a more complete fix is in the works - spec compliance fixes in: - virtio-pci cap commands - vhost_scsi_send_bad_target - virtio console resize - missing locking fix in vhost-scsi - virtio ring - a KCSAN false positive fix - VHOST_*_OWNER documentation fix" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: vhost-scsi: Fix vhost_scsi_send_status() vhost-scsi: Fix vhost_scsi_send_bad_target() vhost-scsi: protect vq->log_used with vq->mutex vhost_task: fix vhost_task_create() documentation virtio_console: fix order of fields cols and rows virtio_console: fix missing byte order handling for cols and rows virtgpu: don't reset on shutdown virtio_ring: Fix data race by tagging event_triggered as racy for KCSAN vhost: fix VHOST_*_OWNER documentation virtio_pci: Use self group type for cap commands
Showing the changes to include/uapi/linux (2 of 10 files). Show all
Unified · Split
| @@ -28,10 +28,10 @@ · 27 unmodified lines | ||
| 28 | 28 | |
| 29 | 29 | /* Set current process as the (exclusive) owner of this file descriptor. This |
| 30 | 30 | * must be called before any other vhost command. Further calls to |
| 31 | − * VHOST_OWNER_SET fail until VHOST_OWNER_RESET is called. */ | |
| 31 | + * VHOST_SET_OWNER fail until VHOST_RESET_OWNER is called. */ | |
| 32 | 32 | #define VHOST_SET_OWNER _IO(VHOST_VIRTIO, 0x01) |
| 33 | 33 | /* Give up ownership, and reset the device to default values. |
| 34 | − * Allows subsequent call to VHOST_OWNER_SET to succeed. */ | |
| 34 | + * Allows subsequent call to VHOST_SET_OWNER to succeed. */ | |
| 35 | 35 | #define VHOST_RESET_OWNER _IO(VHOST_VIRTIO, 0x02) |
| 36 | 36 | |
| 37 | 37 | /* Set up/modify memory layout */ |
| @@ -246,6 +246,7 @@ struct virtio_pci_cfg_cap { · 245 unmodified lines | ||
| 246 | 246 | #define VIRTIO_ADMIN_CMD_LIST_USE 0x1 |
| 247 | 247 | |
| 248 | 248 | /* Admin command group type. */ |
| 249 | +#define VIRTIO_ADMIN_GROUP_TYPE_SELF 0x0 | |
| 249 | 250 | #define VIRTIO_ADMIN_GROUP_TYPE_SRIOV 0x1 |
| 250 | 251 | |
| 251 | 252 | /* Transitional device admin command. */ |