motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtio-scsi: prepare sense data handling for any_layout

Browse source 
Retrieve sense and copy it to guest memory, to prepare for when we will use
qemu_iovec_from_buf.

Swap response and request, since we'll use the tail of VirtIOSCSIReq
for the CDB.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-06-10 16:58:19 +02:00
parent 57fbae6e2c
commit 489c7901a6
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
hw/scsi/virtio-scsi.c
View file

@ -26,12 +26,7 @@ typedef struct VirtIOSCSIReq {
VirtQueueElement elem; VirtQueueElement elem;
QEMUSGList qsgl; QEMUSGList qsgl;
SCSIRequest *sreq; SCSIRequest *sreq;
union { size_t resp_size;
char *buf;
VirtIOSCSICmdReq *cmd;
VirtIOSCSICtrlTMFReq *tmf;
VirtIOSCSICtrlANReq *an;
} req;
union { union {
char *buf; char *buf;
VirtIOSCSICmdResp *cmd; VirtIOSCSICmdResp *cmd;
@ -39,6 +34,12 @@ typedef struct VirtIOSCSIReq {
VirtIOSCSICtrlANResp *an; VirtIOSCSICtrlANResp *an;
VirtIOSCSIEvent *event; VirtIOSCSIEvent *event;
} resp; } resp;
union {
char *buf;
VirtIOSCSICmdReq *cmd;
VirtIOSCSICtrlTMFReq *tmf;
VirtIOSCSICtrlANReq *an;
} req;
} VirtIOSCSIReq; } VirtIOSCSIReq;
static inline int virtio_scsi_get_lun(uint8_t *lun) static inline int virtio_scsi_get_lun(uint8_t *lun)
@ -136,6 +137,7 @@ static int virtio_scsi_parse_req(VirtIOSCSIReq *req,
return -EINVAL; return -EINVAL;
} }
req->resp.buf = req->elem.in_sg[0].iov_base; req->resp.buf = req->elem.in_sg[0].iov_base;
req->resp_size = resp_size;
if (req->elem.out_num > 1) { if (req->elem.out_num > 1) {
qemu_sgl_concat(req, &req->elem.out_sg[1], qemu_sgl_concat(req, &req->elem.out_sg[1],
@ -358,8 +360,7 @@ static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status,
size_t resid) size_t resid)
{ {
VirtIOSCSIReq *req = r->hba_private; VirtIOSCSIReq *req = r->hba_private;
VirtIOSCSI *s = req->dev; uint8_t sense[SCSI_SENSE_BUF_SIZE];
VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(s);
uint32_t sense_len; uint32_t sense_len;
if (r->io_canceled) { if (r->io_canceled) {
@ -372,8 +373,9 @@ static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status,
req->resp.cmd->resid = tswap32(resid); req->resp.cmd->resid = tswap32(resid);
} else { } else {
req->resp.cmd->resid = 0; req->resp.cmd->resid = 0;
sense_len = scsi_req_get_sense(r, req->resp.cmd->sense, sense_len = scsi_req_get_sense(r, sense, sizeof(sense));
vs->sense_size); sense_len = MIN(sense_len, req->resp_size - sizeof(req->resp.cmd));
memcpy(req->resp.cmd->sense, sense, sense_len);
req->resp.cmd->sense_len = tswap32(sense_len); req->resp.cmd->sense_len = tswap32(sense_len);
} }
virtio_scsi_complete_req(req); virtio_scsi_complete_req(req);