[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/16] scsi: move handling of REQUEST SENSE to commo
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 12/16] scsi: move handling of REQUEST SENSE to common code |
Date: |
Wed, 3 Aug 2011 10:49:15 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi-bus.c | 12 ++++++++++--
hw/scsi-disk.c | 9 ++-------
hw/scsi-generic.c | 16 ----------------
3 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 139f6a6..fbb9801 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -270,6 +270,13 @@ static int32_t scsi_target_send_command(SCSIRequest *req,
uint8_t *buf)
goto illegal_request;
}
break;
+ case REQUEST_SENSE:
+ if (req->cmd.xfer < 4) {
+ goto illegal_request;
+ }
+ r->len = scsi_device_get_sense(r->req.dev, r->buf, req->cmd.xfer,
+ (req->cmd.buf[1] & 1) == 0);
+ break;
default:
scsi_req_build_sense(req, SENSE_CODE(LUN_NOT_SUPPORTED));
scsi_req_complete(req, CHECK_CONDITION);
@@ -351,8 +358,9 @@ SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag,
uint32_t lun,
cmd.lba);
}
- if ((lun != d->lun && buf[0] != REQUEST_SENSE) ||
- buf[0] == REPORT_LUNS) {
+ if (lun != d->lun ||
+ buf[0] == REPORT_LUNS ||
+ buf[0] == REQUEST_SENSE) {
req = scsi_req_alloc(&reqops_target_command, d, tag, lun,
hba_private);
} else {
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index a5fdb05..5f21d68 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -792,12 +792,6 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r,
uint8_t *outbuf)
if (!bdrv_is_inserted(s->bs))
goto not_ready;
break;
- case REQUEST_SENSE:
- if (req->cmd.xfer < 4)
- goto illegal_request;
- buflen = scsi_device_get_sense(&s->qdev, outbuf, req->cmd.xfer,
- (req->cmd.buf[1] & 1) == 0);
- break;
case INQUIRY:
buflen = scsi_disk_emulate_inquiry(req, outbuf);
if (buflen < 0)
@@ -974,7 +968,6 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t
*buf)
switch (command) {
case TEST_UNIT_READY:
- case REQUEST_SENSE:
case INQUIRY:
case MODE_SENSE:
case MODE_SENSE_10:
@@ -1074,6 +1067,8 @@ static int32_t scsi_send_command(SCSIRequest *req,
uint8_t *buf)
}
break;
+ case REQUEST_SENSE:
+ abort();
default:
DPRINTF("Unknown SCSI command (%2.2x)\n", buf[0]);
scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE));
diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c
index 5217aaf..c122ad3 100644
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -183,22 +183,6 @@ static void scsi_read_data(SCSIRequest *req)
return;
}
- if (r->req.cmd.buf[0] == REQUEST_SENSE) {
- r->io_header.driver_status = 0;
- r->io_header.status = 0;
- r->io_header.dxfer_len =
- scsi_device_get_sense(&s->qdev, r->buf, r->req.cmd.xfer,
- (r->req.cmd.buf[1] & 1) == 0);
- r->len = -1;
- DPRINTF("Data ready tag=0x%x len=%d\n", r->req.tag,
r->io_header.dxfer_len);
- DPRINTF("Sense: %d %d %d %d %d %d %d %d\n",
- r->buf[0], r->buf[1], r->buf[2], r->buf[3],
- r->buf[4], r->buf[5], r->buf[6], r->buf[7]);
- scsi_req_data(&r->req, r->io_header.dxfer_len);
- /* The sense buffer is cleared when we return GOOD */
- return;
- }
-
ret = execute_command(s->bs, r, SG_DXFER_FROM_DEV, scsi_read_complete);
if (ret < 0) {
scsi_command_complete(r, ret);
--
1.7.6
- [Qemu-devel] [PATCH 06/16] scsi: move request-related callbacks from SCSIDeviceInfo to SCSIReqOps, (continued)
- [Qemu-devel] [PATCH 06/16] scsi: move request-related callbacks from SCSIDeviceInfo to SCSIReqOps, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 05/16] scsi: introduce SCSIReqOps, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 01/16] scsi-disk: no need to call scsi_req_data on a short read, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 08/16] scsi: introduce SCSICommand, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 07/16] scsi: pass cdb already to scsi_req_new, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 11/16] scsi: move handling of REPORT LUNS and invalid LUNs to common code, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 13/16] scsi: add a bunch more common sense codes, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 12/16] scsi: move handling of REQUEST SENSE to common code,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 14/16] scsi: add support for unit attention conditions, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 09/16] scsi: push lun field to SCSIDevice, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 15/16] scsi: report unit attention on reset, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 10/16] scsi: move request parsing to common code, Paolo Bonzini, 2011/08/03
- [Qemu-devel] [PATCH 04/16] scsi: move sense handling to generic code, Paolo Bonzini, 2011/08/03