scsi: Implement 'get_sense' callback
PATCH 1/1 scsi: Implement 'get_sense' callback
The get_sense callback copies existing sense information into the provided buffer. This is required if sense information should be transferred together with the command response.
--- hw/scsi-disk.c | 9 +++++++++ hw/scsi-generic.c | 17 +++++++++++++++++ hw/scsi.h | 1 + 3 files changed, 27 insertions(+), 0 deletions(-)
hw/scsi-disk.c +9 -0
@@ -360,6 +360,14 @@ static uint8_t *scsi_get_buf(SCSIRequest *req)return r->iov_buf; } +/* Copy sense information into the provided buffer */ +static int scsi_get_sense (SCSIRequest *req,uint8_t *outbuf,int len) +{ +SCSIDiskState *s =DO_UPCAST (SCSIDiskState, qdev, req->dev); + +return scsi_build_sense (s->sense, outbuf, len, len >14 ); +} +static int scsi_disk_emulate_inquiry (SCSIRequest *req,uint8_t *outbuf) {SCSIDiskState *s =DO_UPCAST (SCSIDiskState, qdev, req->dev);
@@ -1205,6 +1213,7 @@ static SCSIDeviceInfo scsi_disk_info = { .write_data = scsi_write_data, .cancel_io = scsi_cancel_io, .get_buf = scsi_get_buf, + .get_sense = scsi_get_sense, .qdev.props = (Property []) {DEFINE_BLOCK_PROPERTIES (SCSIDiskState, qdev.conf),DEFINE_PROP_STRING ("ver" , SCSIDiskState, version),
hw/scsi-generic.c +17 -0
@@ -83,6 +83,22 @@ static void scsi_clear_sense(SCSIGenericState *s) s->driver_status =0 ; } +static int scsi_get_sense (SCSIRequest *req,uint8_t *outbuf,int len) +{ +SCSIGenericState *s =DO_UPCAST (SCSIGenericState, qdev, req->dev); +int size =SCSI_SENSE_BUF_SIZE ; + +if (s->driver_status &SG_ERR_DRIVER_SENSE ) { +if (len <SCSI_SENSE_BUF_SIZE ) + size = len; +else + size =SCSI_SENSE_BUF_SIZE ; +memcpy (outbuf, s->sensebuf, size); + } + +return size; +} +static SCSIRequest *scsi_new_request (SCSIDevice *d,uint32_t tag,uint32_t lun) {SCSIRequest *req;
@@ -550,6 +566,7 @@ static SCSIDeviceInfo scsi_generic_info = { .write_data = scsi_write_data, .cancel_io = scsi_cancel_io, .get_buf = scsi_get_buf, + .get_sense = scsi_get_sense, .qdev.props = (Property []) {DEFINE_BLOCK_PROPERTIES (SCSIGenericState, qdev.conf),DEFINE_PROP_END_OF_LIST (),
hw/scsi.h +1 -0
@@ -78,6 +78,7 @@ struct SCSIDeviceInfo {int (*write_data)(SCSIRequest *req);void (*cancel_io)(SCSIRequest *req);uint8_t *(*get_buf)(SCSIRequest *req); +int (*get_sense)(SCSIRequest *req,uint8_t *buf,int len); }; typedef void (*SCSIAttachFn)(DeviceState *host, BlockDriverState *bdrv,
Signature · 1 line
1.6.0.2
hw/scsi-generic.c static void scsi_clear_sense(SCSIGenericState *s) · line 89
Quoted 4 lines · Hannes Reinecke
hw/scsi-generic.c +4
-0+static int scsi_get_sense (SCSIRequest *req,uint8_t *outbuf,int len) +{ + SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev, req->dev); + int size = SCSI_SENSE_BUF_SIZE;
If there is no error we return SCSI_SENSE_BUF_SIZE without touching outbuf? I was expecting a memset(outbuf, 0, ...) or something that initializes outbuf.
Quoted 3 lines
+
+ if (s->driver_status&SG_ERR_DRIVER_SENSE) {
+ if (len <SCSI_SENSE_BUF_SIZE)
{}
Quoted 2 lines
+ size = len;
+ else
{}
Stefan
Quoted 10 lines · Stefan Hajnoczi
hw/scsi-generic.c static void scsi_clear_sense(SCSIGenericState *s) · line 89
Quoted 4 lines · Hannes Reinecke
hw/scsi-generic.c +4
-0+static int scsi_get_sense (SCSIRequest *req,uint8_t *outbuf,int len) +{ +SCSIGenericState *s =DO_UPCAST (SCSIGenericState, qdev, req->dev); +int size =SCSI_SENSE_BUF_SIZE ;If there is no error we return
SCSI_SENSE_BUF_SIZEwithout touching outbuf? I was expecting amemset(outbuf, 0, ...)or something that initializes outbuf.
If there is no error SG_ERR_DRIVER_SENSE is not set, hence there is no sense data to fill out.
But yes, you are correct; we should be doing something sensible here. I'll be setting it to 'NO SENSE' for initialisation.
Quoted 11 lines
hw/scsi-generic.c static void scsi_clear_sense(SCSIGenericState *s) · line 92
Quoted 3 lines
hw/scsi-generic.c +3
-0+ +if (s->driver_status &SG_ERR_DRIVER_SENSE ) { +if (len <SCSI_SENSE_BUF_SIZE ){}
hw/scsi-generic.c static void scsi_clear_sense(SCSIGenericState *s) · line 94
Quoted 2 lines
hw/scsi-generic.c +2
-0+ size = len; + else{}
OK, will be fixing it with the next patchset.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke zSeries & Storage [email protected] +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Markus Rex, HRB 16746 (AG Nürnberg)