From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPwdy-0003F2-Mr for qemu-devel@nongnu.org; Mon, 14 Nov 2011 08:32:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RPwdx-00054X-86 for qemu-devel@nongnu.org; Mon, 14 Nov 2011 08:32:14 -0500 Received: from mail-yx0-f173.google.com ([209.85.213.173]:59007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPwdx-0004xI-5T for qemu-devel@nongnu.org; Mon, 14 Nov 2011 08:32:13 -0500 Received: by mail-yx0-f173.google.com with SMTP id r8so5962818yen.4 for ; Mon, 14 Nov 2011 05:32:12 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 14 Nov 2011 14:31:51 +0100 Message-Id: <1321277512-9414-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1321277512-9414-1-git-send-email-pbonzini@redhat.com> References: <1321277512-9414-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 5/6] scsi: pass down REQUEST SENSE to the device when there is no stored sense List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com This will let scsi-block/scsi-generic report progress on long operations. Reported-by: Thomas Schmitt Tested-by: Thomas Schmitt Signed-off-by: Paolo Bonzini --- hw/scsi-bus.c | 4 +--- hw/scsi-disk.c | 8 ++++++-- hw/scsi.h | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 736dcbb..33bafbb 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -10,8 +10,6 @@ static char *scsibus_get_fw_dev_path(DeviceState *dev); static int scsi_req_parse(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf); static void scsi_req_dequeue(SCSIRequest *req); -static int scsi_build_sense(uint8_t *in_buf, int in_len, - uint8_t *buf, int len, bool fixed); static struct BusInfo scsi_bus_info = { .name = "SCSI", @@ -504,7 +502,7 @@ SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun, hba_private); } else if (lun != d->lun || buf[0] == REPORT_LUNS || - buf[0] == REQUEST_SENSE) { + (buf[0] == REQUEST_SENSE && (d->sense_len || cmd.xfer < 4))) { 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 9224b04..c2a3864 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1210,6 +1210,11 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r) outbuf[7] = 0; buflen = 8; break; + case REQUEST_SENSE: + /* Just return "NO SENSE". */ + buflen = scsi_build_sense(NULL, 0, outbuf, r->buflen, + (req->cmd.buf[1] & 1) == 0); + break; case MECHANISM_STATUS: buflen = scsi_emulate_mechanism_status(s, outbuf); if (buflen < 0) { @@ -1344,6 +1349,7 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) case GET_EVENT_STATUS_NOTIFICATION: case MECHANISM_STATUS: case SERVICE_ACTION_IN_16: + case REQUEST_SENSE: case VERIFY_10: rc = scsi_disk_emulate_command(r); if (rc < 0) { @@ -1435,8 +1441,6 @@ 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.h b/hw/scsi.h index 796ecf1..c790acc 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -182,6 +182,8 @@ extern const struct SCSISense sense_code_DEVICE_INTERNAL_RESET; #define SENSE_CODE(x) sense_code_ ## x int scsi_sense_valid(SCSISense sense); +int scsi_build_sense(uint8_t *in_buf, int in_len, + uint8_t *buf, int len, bool fixed); SCSIRequest *scsi_req_alloc(const SCSIReqOps *reqops, SCSIDevice *d, uint32_t tag, uint32_t lun, void *hba_private); -- 1.7.7.1