fixed atapi error codes (initial patch by Jens Axboe)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@593 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/ide.c b/hw/ide.c
index af90e264564c483220f099ce7c4c88dbca1ee458..1517f63b1441f21e4e3d7e54a41c350887df1353 100644 (file)
--- a/hw/ide.c
+++ b/hw/ide.c
@@ -299,6 +299,7 @@
 #define ATAPI_INT_REASON_TAG            0xf8
 
 /* same constants as bochs */
+#define ASC_ILLEGAL_OPCODE                   0x20
 #define ASC_LOGICAL_BLOCK_OOR                0x21
 #define ASC_INV_FIELD_IN_CMD_PACKET          0x24
 #define ASC_MEDIUM_NOT_PRESENT               0x3a
@@ -1009,7 +1010,10 @@ static void ide_atapi_cmd(IDEState *s)
                 ide_atapi_cmd_reply(s, 12, max_len);
                 break;
             default:
-                goto error_cmd;
+            error_cmd:
+                ide_atapi_cmd_error(s, SENSE_ILLEGAL_REQUEST, 
+                                    ASC_INV_FIELD_IN_CMD_PACKET);
+                break;
             }
         }
         break;
@@ -1040,9 +1044,8 @@ static void ide_atapi_cmd(IDEState *s)
         ide_atapi_cmd_reply(s, 36, max_len);
         break;
     default:
-        error_cmd:
         ide_atapi_cmd_error(s, SENSE_ILLEGAL_REQUEST, 
-                            ASC_INV_FIELD_IN_CMD_PACKET);
+                            ASC_ILLEGAL_OPCODE);
         break;
     }
 }