summary refs log tree commit diff stats
path: root/hw/scsi-defs.h
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-09-08 09:05:14 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-09-08 09:05:14 -0500
commit220724ca4ada4e30bcfff326b62822a69c23e181 (patch)
treec0bb1bdd3ec41c5945000cf43620725d2e00ffd8 /hw/scsi-defs.h
parentd8ac46d950451a722fd6b1d5d0768c72bee87d47 (diff)
parentcfc606da0ddcef1f7228317b9f7dfa6c94c6c64f (diff)
downloadfocaccia-qemu-220724ca4ada4e30bcfff326b62822a69c23e181.tar.gz
focaccia-qemu-220724ca4ada4e30bcfff326b62822a69c23e181.zip
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw/scsi-defs.h')
-rw-r--r--hw/scsi-defs.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/scsi-defs.h b/hw/scsi-defs.h
index ea288fab07..bfe93922d4 100644
--- a/hw/scsi-defs.h
+++ b/hw/scsi-defs.h
@@ -102,7 +102,7 @@
 #define LOCATE_16             0x92
 #define WRITE_SAME_16         0x93
 #define ERASE_16              0x93
-#define SERVICE_ACTION_IN     0x9e
+#define SERVICE_ACTION_IN_16  0x9e
 #define WRITE_LONG_16         0x9f
 #define REPORT_LUNS           0xa0
 #define BLANK                 0xa1
@@ -112,6 +112,7 @@
 #define LOAD_UNLOAD           0xa6
 #define READ_12               0xa8
 #define WRITE_12              0xaa
+#define SERVICE_ACTION_IN_12  0xab
 #define WRITE_VERIFY_12       0xae
 #define VERIFY_12             0xaf
 #define SEARCH_HIGH_12        0xb0
@@ -123,6 +124,11 @@
 #define SET_CD_SPEED          0xbb
 
 /*
+ * SERVICE ACTION IN subcodes
+ */
+#define SAI_READ_CAPACITY_16  0x10
+
+/*
  *  SAM Status codes
  */