aboutsummaryrefslogtreecommitdiff
path: root/hw/scsi-defs.h
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2010-11-30 15:25:34 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2010-11-30 15:25:34 -0600
commit09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2 (patch)
treeb11bb495700b297a4d49692bfd8d6070a1b74e0b /hw/scsi-defs.h
parent9233da785f55c924c5850cd1ce1b7f5f200d631b (diff)
parentb76876e602ca09ff848d99595a506feb1fd54ff4 (diff)
downloadqemu-09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2.zip
qemu-09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2.tar.gz
qemu-09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2.tar.bz2
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw/scsi-defs.h')
-rw-r--r--hw/scsi-defs.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/hw/scsi-defs.h b/hw/scsi-defs.h
index a4a3518..1473ecb 100644
--- a/hw/scsi-defs.h
+++ b/hw/scsi-defs.h
@@ -111,18 +111,20 @@
#define BLANK 0xa1
/*
- * Status codes
+ * SAM Status codes
*/
#define GOOD 0x00
-#define CHECK_CONDITION 0x01
-#define CONDITION_GOOD 0x02
-#define BUSY 0x04
-#define INTERMEDIATE_GOOD 0x08
-#define INTERMEDIATE_C_GOOD 0x0a
-#define RESERVATION_CONFLICT 0x0c
-#define COMMAND_TERMINATED 0x11
-#define QUEUE_FULL 0x14
+#define CHECK_CONDITION 0x02
+#define CONDITION_GOOD 0x04
+#define BUSY 0x08
+#define INTERMEDIATE_GOOD 0x10
+#define INTERMEDIATE_C_GOOD 0x14
+#define RESERVATION_CONFLICT 0x18
+#define COMMAND_TERMINATED 0x22
+#define TASK_SET_FULL 0x28
+#define ACA_ACTIVE 0x30
+#define TASK_ABORTED 0x40
#define STATUS_MASK 0x3e