89 lines
3.4 KiB
Diff
89 lines
3.4 KiB
Diff
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Tue, 22 Aug 2017 09:31:36 +0200
|
|
Subject: [PATCH] scsi: rename scsi_build_sense to scsi_convert_sense
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
After introducing the scsi/ subdirectory, there will be a scsi_build_sense
|
|
function that is the same as scsi_req_build_sense but without needing
|
|
a SCSIRequest. The existing scsi_build_sense function gets in the way,
|
|
remove it.
|
|
|
|
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
hw/scsi/scsi-bus.c | 10 +++++-----
|
|
hw/scsi/scsi-disk.c | 4 ++--
|
|
include/hw/scsi/scsi.h | 4 ++--
|
|
3 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
|
|
index ade31c11f5..fac360e20f 100644
|
|
--- a/hw/scsi/scsi-bus.c
|
|
+++ b/hw/scsi/scsi-bus.c
|
|
@@ -790,7 +790,7 @@ int scsi_req_get_sense(SCSIRequest *req, uint8_t *buf, int len)
|
|
return 0;
|
|
}
|
|
|
|
- ret = scsi_build_sense(req->sense, req->sense_len, buf, len, true);
|
|
+ ret = scsi_convert_sense(req->sense, req->sense_len, buf, len, true);
|
|
|
|
/*
|
|
* FIXME: clearing unit attention conditions upon autosense should be done
|
|
@@ -811,7 +811,7 @@ int scsi_req_get_sense(SCSIRequest *req, uint8_t *buf, int len)
|
|
|
|
int scsi_device_get_sense(SCSIDevice *dev, uint8_t *buf, int len, bool fixed)
|
|
{
|
|
- return scsi_build_sense(dev->sense, dev->sense_len, buf, len, fixed);
|
|
+ return scsi_convert_sense(dev->sense, dev->sense_len, buf, len, fixed);
|
|
}
|
|
|
|
void scsi_req_build_sense(SCSIRequest *req, SCSISense sense)
|
|
@@ -1531,12 +1531,12 @@ const struct SCSISense sense_code_SPACE_ALLOC_FAILED = {
|
|
};
|
|
|
|
/*
|
|
- * scsi_build_sense
|
|
+ * scsi_convert_sense
|
|
*
|
|
* Convert between fixed and descriptor sense buffers
|
|
*/
|
|
-int scsi_build_sense(uint8_t *in_buf, int in_len,
|
|
- uint8_t *buf, int len, bool fixed)
|
|
+int scsi_convert_sense(uint8_t *in_buf, int in_len,
|
|
+ uint8_t *buf, int len, bool fixed)
|
|
{
|
|
bool fixed_in;
|
|
SCSISense sense;
|
|
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
|
|
index 5f1e5e8070..0a1f4ef0c7 100644
|
|
--- a/hw/scsi/scsi-disk.c
|
|
+++ b/hw/scsi/scsi-disk.c
|
|
@@ -1978,8 +1978,8 @@ static int32_t scsi_disk_emulate_command(SCSIRequest *req, uint8_t *buf)
|
|
break;
|
|
case REQUEST_SENSE:
|
|
/* Just return "NO SENSE". */
|
|
- buflen = scsi_build_sense(NULL, 0, outbuf, r->buflen,
|
|
- (req->cmd.buf[1] & 1) == 0);
|
|
+ buflen = scsi_convert_sense(NULL, 0, outbuf, r->buflen,
|
|
+ (req->cmd.buf[1] & 1) == 0);
|
|
if (buflen < 0) {
|
|
goto illegal_request;
|
|
}
|
|
diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
|
|
index 6b85786dbf..6ef67fb504 100644
|
|
--- a/include/hw/scsi/scsi.h
|
|
+++ b/include/hw/scsi/scsi.h
|
|
@@ -244,8 +244,8 @@ extern const struct SCSISense sense_code_SPACE_ALLOC_FAILED;
|
|
uint32_t scsi_data_cdb_xfer(uint8_t *buf);
|
|
uint32_t scsi_cdb_xfer(uint8_t *buf);
|
|
int scsi_cdb_length(uint8_t *buf);
|
|
-int scsi_build_sense(uint8_t *in_buf, int in_len,
|
|
- uint8_t *buf, int len, bool fixed);
|
|
+int scsi_convert_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);
|