Pull vhost cleanups and fixes from Michael Tsirkin: "Here are vhost cleanups and fixes by Asias He and myself. They affect both vhost-net and vhost-scsi devices. They also *depend* on both net-next and target-pending, where the net and target commits these changes depend on are already merged. So merging through the common vhost tree." * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: vhost_scsi: module rename tcm_vhost: header split up vhost: src file renames vhost: fix error handling in RESET_OWNER ioctl tcm_vhost: remove virtio-net.h dependency vhost: move per-vq net specific fields out to net tcm_vhost: document inflight ref-counting use vhost: move vhost-net zerocopy fields to net.c tcm_vhost: Wait for pending requests in vhost_scsi_flush() vhost: Allow device specific fields per vq
Showing the changes to include/uapi/linux (1 of 10 files). Show all
Unified · Split
| @@ -127,4 +127,32 @@ struct vhost_memory { · 126 unmodified lines | |||
| 127 | /* vhost-net should add virtio_net_hdr for RX, and strip for TX packets. */ | 127 | /* vhost-net should add virtio_net_hdr for RX, and strip for TX packets. */ |
| 128 | #define VHOST_NET_F_VIRTIO_NET_HDR 27 | 128 | #define VHOST_NET_F_VIRTIO_NET_HDR 27 |
| 129 | 129 | ||
| 130 | /* VHOST_SCSI specific definitions */ | ||
| 131 | |||
| 132 | /* | ||
| 133 | * Used by QEMU userspace to ensure a consistent vhost-scsi ABI. | ||
| 134 | * | ||
| 135 | * ABI Rev 0: July 2012 version starting point for v3.6-rc merge candidate + | ||
| 136 | * RFC-v2 vhost-scsi userspace. Add GET_ABI_VERSION ioctl usage | ||
| 137 | * ABI Rev 1: January 2013. Ignore vhost_tpgt filed in struct vhost_scsi_target. | ||
| 138 | * All the targets under vhost_wwpn can be seen and used by guset. | ||
| 139 | */ | ||
| 140 | |||
| 141 | #define VHOST_SCSI_ABI_VERSION 1 | ||
| 142 | |||
| 143 | struct vhost_scsi_target { | ||
| 144 | int abi_version; | ||
| 145 | char vhost_wwpn[224]; /* TRANSPORT_IQN_LEN */ | ||
| 146 | unsigned short vhost_tpgt; | ||
| 147 | unsigned short reserved; | ||
| 148 | }; | ||
| 149 | |||
| 150 | #define VHOST_SCSI_SET_ENDPOINT _IOW(VHOST_VIRTIO, 0x40, struct vhost_scsi_target) | ||
| 151 | #define VHOST_SCSI_CLEAR_ENDPOINT _IOW(VHOST_VIRTIO, 0x41, struct vhost_scsi_target) | ||
| 152 | /* Changing this breaks userspace. */ | ||
| 153 | #define VHOST_SCSI_GET_ABI_VERSION _IOW(VHOST_VIRTIO, 0x42, int) | ||
| 154 | /* Set and get the events missed flag */ | ||
| 155 | #define VHOST_SCSI_SET_EVENTS_MISSED _IOW(VHOST_VIRTIO, 0x43, __u32) | ||
| 156 | #define VHOST_SCSI_GET_EVENTS_MISSED _IOW(VHOST_VIRTIO, 0x44, __u32) | ||
| 157 | |||
| 130 | #endif | 158 | #endif |