From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 27 Nov 2017 12:45:59 +0000 (+0100)
Subject: scsi: replace hex constants with #defines
X-Git-Tag: v2.12.0-rc0~180^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9661e208f8cc94f66176db6f069a0f8adef9478d;p=thirdparty%2Fqemu.git

scsi: replace hex constants with #defines

Sense keys have nice #defines in scsi/constants.h, use them.

Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/scsi/utils.c b/scsi/utils.c
index 61bc1a8e2b4..ddae650a999 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: