diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-09-08 14:26:57 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-09-08 14:26:57 -0500 |
| commit | aab2e8f79ad253c760787ff3ce4d64967fed0003 (patch) | |
| tree | bc837d155b4d558b71ad196c561f9e71c10136d0 /hw/scsi-generic.c | |
| parent | dccbe6fbab47c9a2589f436e0592933b47cbe40b (diff) | |
| parent | 7ec5e6a4ca43494949465f9f9f3d9e4c7c620503 (diff) | |
| download | focaccia-qemu-aab2e8f79ad253c760787ff3ce4d64967fed0003.tar.gz focaccia-qemu-aab2e8f79ad253c760787ff3ce4d64967fed0003.zip | |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw/scsi-generic.c')
| -rw-r--r-- | hw/scsi-generic.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index aa4f62ae57..953802777d 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -164,7 +164,7 @@ static void scsi_read_complete(void * opaque, int ret) int len; if (ret) { - DPRINTF("IO error\n"); + DPRINTF("IO error ret %d\n", ret); scsi_command_complete(r, ret); return; } @@ -236,7 +236,7 @@ static void scsi_write_complete(void * opaque, int ret) if (r->req.cmd.buf[0] == MODE_SELECT && r->req.cmd.buf[4] == 12 && s->qdev.type == TYPE_TAPE) { s->qdev.blocksize = (r->buf[9] << 16) | (r->buf[10] << 8) | r->buf[11]; - DPRINTF("block size %d\n", s->blocksize); + DPRINTF("block size %d\n", s->qdev.blocksize); } scsi_command_complete(r, ret); @@ -351,8 +351,18 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, } scsi_req_fixup(&r->req); - DPRINTF("Command: lun=%d tag=0x%x data=0x%02x len %d\n", lun, tag, - cmd[0], r->req.cmd.xfer); + DPRINTF("Command: lun=%d tag=0x%x len %zd data=0x%02x", lun, tag, + r->req.cmd.xfer, cmd[0]); + +#ifdef DEBUG_SCSI + { + int i; + for (i = 1; i < r->req.cmd.len; i++) { + printf(" 0x%02x", cmd[i]); + } + printf("\n"); + } +#endif if (r->req.cmd.xfer == 0) { if (r->buf != NULL) |