diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2010-12-01 07:11:51 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2010-12-01 07:11:51 +0200 |
| commit | a4856fd5bf47823f501585962e39951683ef620d (patch) | |
| tree | 04e57676b1db1db7d8b33934b349f8f37780fa2a /hw/scsi-defs.h | |
| parent | 26657874549b09f95c03879ae02190896d736f09 (diff) | |
| parent | 3d0e94c3a32a8f39009b8a56c88ca62e7e156510 (diff) | |
| download | qemu-a4856fd5bf47823f501585962e39951683ef620d.tar.gz qemu-a4856fd5bf47823f501585962e39951683ef620d.tar.bz2 qemu-a4856fd5bf47823f501585962e39951683ef620d.zip | |
Merge remote branch 'origin/master' into pci
Conflicts:
Makefile.objs
hw/virtio.c
Diffstat (limited to 'hw/scsi-defs.h')
| -rw-r--r-- | hw/scsi-defs.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/hw/scsi-defs.h b/hw/scsi-defs.h index a4a3518eb8..1473ecbddc 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 |