Revision aa2b1e89

b/hw/lsi53c895a.c
600 600
{
601 601
    lsi_request *p = s->current;
602 602

  
603
    DPRINTF("Queueing tag=0x%x\n", s->current_tag);
603
    DPRINTF("Queueing tag=0x%x\n", p->tag);
604 604
    assert(s->current != NULL);
605 605
    assert(s->current->dma_len == 0);
606 606
    QTAILQ_INSERT_TAIL(&s->queue, s->current, next);
......
880 880
            break;
881 881
        case 0x20: /* SIMPLE queue */
882 882
            s->select_tag |= lsi_get_msgbyte(s) | LSI_TAG_VALID;
883
            DPRINTF("SIMPLE queue tag=0x%x\n", s->current_tag & 0xff);
883
            DPRINTF("SIMPLE queue tag=0x%x\n", s->select_tag & 0xff);
884 884
            break;
885 885
        case 0x21: /* HEAD of queue */
886 886
            BADF("HEAD queue not implemented\n");
b/hw/scsi-disk.c
135 135
        scsi_command_complete(r, CHECK_CONDITION, NO_SENSE);
136 136
        return;
137 137
    }
138
    DPRINTF("Data ready tag=0x%x len=%" PRId64 "\n", r->req.tag, r->iov.iov_len);
138
    DPRINTF("Data ready tag=0x%x len=%zd\n", r->req.tag, r->iov.iov_len);
139 139

  
140 140
    r->req.bus->complete(r->req.bus, SCSI_REASON_DATA, r->req.tag, r->iov.iov_len);
141 141
}
......
155 155
        return;
156 156
    }
157 157
    if (r->sector_count == (uint32_t)-1) {
158
        DPRINTF("Read buf_len=%" PRId64 "\n", r->iov.iov_len);
158
        DPRINTF("Read buf_len=%zd\n", r->iov.iov_len);
159 159
        r->sector_count = 0;
160 160
        r->req.bus->complete(r->req.bus, SCSI_REASON_DATA, r->req.tag, r->iov.iov_len);
161 161
        return;
......
631 631
    dbd = req->cmd.buf[1]  & 0x8;
632 632
    page = req->cmd.buf[2] & 0x3f;
633 633
    page_control = (req->cmd.buf[2] & 0xc0) >> 6;
634
    DPRINTF("Mode Sense(%d) (page %d, len %d, page_control %d)\n",
635
        (req->cmd.buf[0] == MODE_SENSE) ? 6 : 10, page, len, page_control);
634
    DPRINTF("Mode Sense(%d) (page %d, xfer %zd, page_control %d)\n",
635
        (req->cmd.buf[0] == MODE_SENSE) ? 6 : 10, page, req->cmd.xfer, page_control);
636 636
    memset(outbuf, 0, req->cmd.xfer);
637 637
    p = outbuf;
638 638

  
b/hw/scsi-generic.c
164 164
    int len;
165 165

  
166 166
    if (ret) {
167
        DPRINTF("IO error\n");
167
        DPRINTF("IO error ret %d\n", ret);
168 168
        scsi_command_complete(r, ret);
169 169
        return;
170 170
    }
......
236 236
    if (r->req.cmd.buf[0] == MODE_SELECT && r->req.cmd.buf[4] == 12 &&
237 237
        s->qdev.type == TYPE_TAPE) {
238 238
        s->qdev.blocksize = (r->buf[9] << 16) | (r->buf[10] << 8) | r->buf[11];
239
        DPRINTF("block size %d\n", s->blocksize);
239
        DPRINTF("block size %d\n", s->qdev.blocksize);
240 240
    }
241 241

  
242 242
    scsi_command_complete(r, ret);
......
351 351
    }
352 352
    scsi_req_fixup(&r->req);
353 353

  
354
    DPRINTF("Command: lun=%d tag=0x%x data=0x%02x len %d\n", lun, tag,
355
            cmd[0], r->req.cmd.xfer);
354
    DPRINTF("Command: lun=%d tag=0x%x len %zd data=0x%02x", lun, tag,
355
            r->req.cmd.xfer, cmd[0]);
356

  
357
#ifdef DEBUG_SCSI
358
    {
359
        int i;
360
        for (i = 1; i < r->req.cmd.len; i++) {
361
            printf(" 0x%02x", cmd[i]);
362
        }
363
        printf("\n");
364
    }
365
#endif
356 366

  
357 367
    if (r->req.cmd.xfer == 0) {
358 368
        if (r->buf != NULL)

Also available in: Unified diff