| Message ID | 20171217052945.12782-2-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | scsi: replace hex constants with #defines | expand |
On 12/17/2017 02:29 AM, Paolo Bonzini wrote: > Sense keys have nice #defines in scsi/constants.h, use them. > > Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > scsi/utils.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/scsi/utils.c b/scsi/utils.c > index 61bc1a8e2b..ddae650a99 100644 > --- a/scsi/utils.c > +++ b/scsi/utils.c > @@ -339,16 +339,16 @@ int scsi_convert_sense(uint8_t *in_buf, int in_len, > int scsi_sense_to_errno(int key, int asc, int ascq) > { > switch (key) { > - case 0x00: /* NO SENSE */ > - case 0x01: /* RECOVERED ERROR */ > - case 0x06: /* UNIT ATTENTION */ > + case NO_SENSE: > + case RECOVERED_ERROR: > + case UNIT_ATTENTION: > /* These sense keys are not errors */ > return 0; > - case 0x0b: /* COMMAND ABORTED */ > + case ABORTED_COMMAND: /* COMMAND ABORTED */ > return ECANCELED; > - case 0x02: /* NOT READY */ > - case 0x05: /* ILLEGAL REQUEST */ > - case 0x07: /* DATA PROTECTION */ > + case NOT_READY: > + case ILLEGAL_REQUEST: > + case DATA_PROTECT: > /* Parse ASCQ */ > break; > default: >
diff --git a/scsi/utils.c b/scsi/utils.c index 61bc1a8e2b..ddae650a99 100644 --- a/scsi/utils.c +++ b/scsi/utils.c @@ -339,16 +339,16 @@ int scsi_convert_sense(uint8_t *in_buf, int in_len, int scsi_sense_to_errno(int key, int asc, int ascq) { switch (key) { - case 0x00: /* NO SENSE */ - case 0x01: /* RECOVERED ERROR */ - case 0x06: /* UNIT ATTENTION */ + case NO_SENSE: + case RECOVERED_ERROR: + case UNIT_ATTENTION: /* These sense keys are not errors */ return 0; - case 0x0b: /* COMMAND ABORTED */ + case ABORTED_COMMAND: /* COMMAND ABORTED */ return ECANCELED; - case 0x02: /* NOT READY */ - case 0x05: /* ILLEGAL REQUEST */ - case 0x07: /* DATA PROTECTION */ + case NOT_READY: + case ILLEGAL_REQUEST: + case DATA_PROTECT: /* Parse ASCQ */ break; default:
Sense keys have nice #defines in scsi/constants.h, use them. Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- scsi/utils.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)