[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] scsi-disk: fix compilation with DEBUG_SCSI
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 04/10] scsi-disk: fix compilation with DEBUG_SCSI |
Date: |
Fri, 3 Aug 2012 10:06:14 +0200 |
Reported-by: Gerhard Wiesinger <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi-disk.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index e2ec177..a9c7279 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -447,7 +447,7 @@ static void scsi_write_complete(void * opaque, int ret)
return;
} else {
scsi_init_iovec(r, SCSI_DMA_BUF_SIZE);
- DPRINTF("Write complete tag=0x%x more=%d\n", r->req.tag, r->qiov.size);
+ DPRINTF("Write complete tag=0x%x more=%zd\n", r->req.tag,
r->qiov.size);
scsi_req_data(&r->req, r->qiov.size);
}
@@ -1277,7 +1277,7 @@ static void scsi_disk_emulate_read_data(SCSIRequest *req)
int buflen = r->iov.iov_len;
if (buflen) {
- DPRINTF("Read buf_len=%zd\n", buflen);
+ DPRINTF("Read buf_len=%d\n", buflen);
r->iov.iov_len = 0;
r->started = true;
scsi_req_data(&r->req, buflen);
@@ -1455,7 +1455,7 @@ static void scsi_disk_emulate_write_data(SCSIRequest *req)
if (r->iov.iov_len) {
int buflen = r->iov.iov_len;
- DPRINTF("Write buf_len=%zd\n", buflen);
+ DPRINTF("Write buf_len=%d\n", buflen);
r->iov.iov_len = 0;
scsi_req_data(&r->req, buflen);
return;
@@ -2093,23 +2093,24 @@ static SCSIRequest *scsi_new_request(SCSIDevice *d,
uint32_t tag, uint32_t lun,
const SCSIReqOps *ops;
uint8_t command;
+ command = buf[0];
+ ops = scsi_disk_reqops_dispatch[command];
+ if (!ops) {
+ ops = &scsi_disk_emulate_reqops;
+ }
+ req = scsi_req_alloc(ops, &s->qdev, tag, lun, hba_private);
+
#ifdef DEBUG_SCSI
- DPRINTF("Command: lun=%d tag=0x%x data=0x%02x", lun, buf[0]);
+ DPRINTF("Command: lun=%d tag=0x%x data=0x%02x", lun, tag, buf[0]);
{
int i;
- for (i = 1; i < r->req.cmd.len; i++) {
+ for (i = 1; i < req->cmd.len; i++) {
printf(" 0x%02x", buf[i]);
}
printf("\n");
}
#endif
- command = buf[0];
- ops = scsi_disk_reqops_dispatch[command];
- if (!ops) {
- ops = &scsi_disk_emulate_reqops;
- }
- req = scsi_req_alloc(ops, &s->qdev, tag, lun, hba_private);
return req;
}
--
1.7.10.4
- [Qemu-devel] [PULL 00/10] SCSI patches for 2012-08-03, Paolo Bonzini, 2012/08/03
- [Qemu-devel] [PATCH 01/10] SCSI: Update the sense code for PREVENT REMOVAL errors, Paolo Bonzini, 2012/08/03
- [Qemu-devel] [PATCH 03/10] megasas: Update function megasys_scsi_uninit, Paolo Bonzini, 2012/08/03
- [Qemu-devel] [PATCH 02/10] SCSI: STARTSTOPUNIT only eject/load media if powercondition is 0, Paolo Bonzini, 2012/08/03
- [Qemu-devel] [PATCH 05/10] megasas: static SAS addresses, Paolo Bonzini, 2012/08/03
- [Qemu-devel] [PATCH 04/10] scsi-disk: fix compilation with DEBUG_SCSI,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 06/10] Revert "megasas: disable due to build breakage", Paolo Bonzini, 2012/08/03
- [Qemu-devel] [PATCH 07/10] esp: enable for all PCI machines, Paolo Bonzini, 2012/08/03
- [Qemu-devel] [PATCH 09/10] esp: add Tekram DC-390 emulation (PC SCSI adapter), Paolo Bonzini, 2012/08/03
- [Qemu-devel] [PATCH 08/10] esp: add missing const on TypeInfo structures, Paolo Bonzini, 2012/08/03
- [Qemu-devel] [PATCH 10/10] scsi: add support for ATA_PASSTHROUGH_xx scsi command, Paolo Bonzini, 2012/08/03
- Re: [Qemu-devel] [PULL 00/10] SCSI patches for 2012-08-03, Anthony Liguori, 2012/08/03