提交 fba7f020 编写于 作者: M Michael S. Tsirkin

virtio_scsi: export to userspace

Replace uXX by __uXX and _packed by __attribute((packed))
as seems to be the norm for userspace headers.
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
Acked-by: NPaolo Bonzini <pbonzini@redhat.com>


上级 106d81f5
...@@ -428,6 +428,7 @@ header-y += virtio_net.h ...@@ -428,6 +428,7 @@ header-y += virtio_net.h
header-y += virtio_pci.h header-y += virtio_pci.h
header-y += virtio_ring.h header-y += virtio_ring.h
header-y += virtio_rng.h header-y += virtio_rng.h
header-y += virtio_scsi.h
header-y += vm_sockets.h header-y += vm_sockets.h
header-y += vt.h header-y += vt.h
header-y += wait.h header-y += wait.h
......
...@@ -34,78 +34,78 @@ ...@@ -34,78 +34,78 @@
/* SCSI command request, followed by data-out */ /* SCSI command request, followed by data-out */
struct virtio_scsi_cmd_req { struct virtio_scsi_cmd_req {
u8 lun[8]; /* Logical Unit Number */ __u8 lun[8]; /* Logical Unit Number */
__virtio64 tag; /* Command identifier */ __virtio64 tag; /* Command identifier */
u8 task_attr; /* Task attribute */ __u8 task_attr; /* Task attribute */
u8 prio; /* SAM command priority field */ __u8 prio; /* SAM command priority field */
u8 crn; __u8 crn;
u8 cdb[VIRTIO_SCSI_CDB_SIZE]; __u8 cdb[VIRTIO_SCSI_CDB_SIZE];
} __packed; } __attribute__((packed));
/* SCSI command request, followed by protection information */ /* SCSI command request, followed by protection information */
struct virtio_scsi_cmd_req_pi { struct virtio_scsi_cmd_req_pi {
u8 lun[8]; /* Logical Unit Number */ __u8 lun[8]; /* Logical Unit Number */
__virtio64 tag; /* Command identifier */ __virtio64 tag; /* Command identifier */
u8 task_attr; /* Task attribute */ __u8 task_attr; /* Task attribute */
u8 prio; /* SAM command priority field */ __u8 prio; /* SAM command priority field */
u8 crn; __u8 crn;
__virtio32 pi_bytesout; /* DataOUT PI Number of bytes */ __virtio32 pi_bytesout; /* DataOUT PI Number of bytes */
__virtio32 pi_bytesin; /* DataIN PI Number of bytes */ __virtio32 pi_bytesin; /* DataIN PI Number of bytes */
u8 cdb[VIRTIO_SCSI_CDB_SIZE]; __u8 cdb[VIRTIO_SCSI_CDB_SIZE];
} __packed; } __attribute__((packed));
/* Response, followed by sense data and data-in */ /* Response, followed by sense data and data-in */
struct virtio_scsi_cmd_resp { struct virtio_scsi_cmd_resp {
__virtio32 sense_len; /* Sense data length */ __virtio32 sense_len; /* Sense data length */
__virtio32 resid; /* Residual bytes in data buffer */ __virtio32 resid; /* Residual bytes in data buffer */
__virtio16 status_qualifier; /* Status qualifier */ __virtio16 status_qualifier; /* Status qualifier */
u8 status; /* Command completion status */ __u8 status; /* Command completion status */
u8 response; /* Response values */ __u8 response; /* Response values */
u8 sense[VIRTIO_SCSI_SENSE_SIZE]; __u8 sense[VIRTIO_SCSI_SENSE_SIZE];
} __packed; } __attribute__((packed));
/* Task Management Request */ /* Task Management Request */
struct virtio_scsi_ctrl_tmf_req { struct virtio_scsi_ctrl_tmf_req {
__virtio32 type; __virtio32 type;
__virtio32 subtype; __virtio32 subtype;
u8 lun[8]; __u8 lun[8];
__virtio64 tag; __virtio64 tag;
} __packed; } __attribute__((packed));
struct virtio_scsi_ctrl_tmf_resp { struct virtio_scsi_ctrl_tmf_resp {
u8 response; __u8 response;
} __packed; } __attribute__((packed));
/* Asynchronous notification query/subscription */ /* Asynchronous notification query/subscription */
struct virtio_scsi_ctrl_an_req { struct virtio_scsi_ctrl_an_req {
__virtio32 type; __virtio32 type;
u8 lun[8]; __u8 lun[8];
__virtio32 event_requested; __virtio32 event_requested;
} __packed; } __attribute__((packed));
struct virtio_scsi_ctrl_an_resp { struct virtio_scsi_ctrl_an_resp {
__virtio32 event_actual; __virtio32 event_actual;
u8 response; __u8 response;
} __packed; } __attribute__((packed));
struct virtio_scsi_event { struct virtio_scsi_event {
__virtio32 event; __virtio32 event;
u8 lun[8]; __u8 lun[8];
__virtio32 reason; __virtio32 reason;
} __packed; } __attribute__((packed));
struct virtio_scsi_config { struct virtio_scsi_config {
u32 num_queues; __u32 num_queues;
u32 seg_max; __u32 seg_max;
u32 max_sectors; __u32 max_sectors;
u32 cmd_per_lun; __u32 cmd_per_lun;
u32 event_info_size; __u32 event_info_size;
u32 sense_size; __u32 sense_size;
u32 cdb_size; __u32 cdb_size;
u16 max_channel; __u16 max_channel;
u16 max_target; __u16 max_target;
u32 max_lun; __u32 max_lun;
} __packed; } __attribute__((packed));
/* Feature Bits */ /* Feature Bits */
#define VIRTIO_SCSI_F_INOUT 0 #define VIRTIO_SCSI_F_INOUT 0
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册