[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 05/15] scsi: pass residual amount to command_comp
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 05/15] scsi: pass residual amount to command_complete |
Date: |
Mon, 13 Feb 2012 18:10:12 +0100 |
With the upcoming sglist support, HBAs will not see any transfer_data
call and will not have a way to detect short transfers. So pass the
residual amount of data upon command completion.
Signed-off-by: Paolo Bonzini <address@hidden>
---
v2->v3: fixed resid type (Stefan)
hw/esp.c | 3 ++-
hw/lsi53c895a.c | 2 +-
hw/scsi-bus.c | 12 ++++++++----
hw/scsi.h | 3 ++-
hw/spapr_vscsi.c | 2 +-
hw/usb-msd.c | 2 +-
6 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/hw/esp.c b/hw/esp.c
index 2f44386..991e091 100644
--- a/hw/esp.c
+++ b/hw/esp.c
@@ -390,7 +390,8 @@ static void esp_do_dma(ESPState *s)
esp_dma_done(s);
}
-static void esp_command_complete(SCSIRequest *req, uint32_t status)
+static void esp_command_complete(SCSIRequest *req, uint32_t status,
+ size_t resid)
{
ESPState *s = DO_UPCAST(ESPState, busdev.qdev, req->bus->qbus.parent);
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 9a7ffe3..e36fe35 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -699,7 +699,7 @@ static int lsi_queue_req(LSIState *s, SCSIRequest *req,
uint32_t len)
}
/* Callback to indicate that the SCSI layer has completed a command. */
-static void lsi_command_complete(SCSIRequest *req, uint32_t status)
+static void lsi_command_complete(SCSIRequest *req, uint32_t status, size_t
resid)
{
LSIState *s = DO_UPCAST(LSIState, dev.qdev, req->bus->qbus.parent);
int out;
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 0ee50a8..6a069f4 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -533,6 +533,8 @@ SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag,
uint32_t lun,
}
req->cmd = cmd;
+ req->resid = req->cmd.xfer;
+
switch (buf[0]) {
case INQUIRY:
trace_scsi_inquiry(d->id, lun, tag, cmd.buf[1], cmd.buf[2]);
@@ -1275,10 +1277,12 @@ void scsi_req_data(SCSIRequest *req, int len)
{
if (req->io_canceled) {
trace_scsi_req_data_canceled(req->dev->id, req->lun, req->tag, len);
- } else {
- trace_scsi_req_data(req->dev->id, req->lun, req->tag, len);
- req->bus->info->transfer_data(req, len);
+ return;
}
+ trace_scsi_req_data(req->dev->id, req->lun, req->tag, len);
+ assert(req->cmd.mode != SCSI_XFER_NONE);
+ req->resid -= len;
+ req->bus->info->transfer_data(req, len);
}
void scsi_req_print(SCSIRequest *req)
@@ -1337,7 +1341,7 @@ void scsi_req_complete(SCSIRequest *req, int status)
scsi_req_ref(req);
scsi_req_dequeue(req);
- req->bus->info->complete(req, req->status);
+ req->bus->info->complete(req, req->status, req->resid);
scsi_req_unref(req);
}
diff --git a/hw/scsi.h b/hw/scsi.h
index dc72b6f..e1c52d2 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -46,6 +46,7 @@ struct SCSIRequest {
uint32_t tag;
uint32_t lun;
uint32_t status;
+ size_t resid;
SCSICommand cmd;
BlockDriverAIOCB *aiocb;
uint8_t sense[SCSI_SENSE_BUF_SIZE];
@@ -112,7 +113,7 @@ struct SCSIBusInfo {
int tcq;
int max_channel, max_target, max_lun;
void (*transfer_data)(SCSIRequest *req, uint32_t arg);
- void (*complete)(SCSIRequest *req, uint32_t arg);
+ void (*complete)(SCSIRequest *req, uint32_t arg, size_t resid);
void (*cancel)(SCSIRequest *req);
};
diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c
index 9cfce19..d7123df 100644
--- a/hw/spapr_vscsi.c
+++ b/hw/spapr_vscsi.c
@@ -494,7 +494,7 @@ static void vscsi_transfer_data(SCSIRequest *sreq, uint32_t
len)
}
/* Callback to indicate that the SCSI layer has completed a transfer. */
-static void vscsi_command_complete(SCSIRequest *sreq, uint32_t status)
+static void vscsi_command_complete(SCSIRequest *sreq, uint32_t status, size_t
resid)
{
VSCSIState *s = DO_UPCAST(VSCSIState, vdev.qdev, sreq->bus->qbus.parent);
vscsi_req *req = sreq->hba_private;
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index 6153376..47b8b8e 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -223,7 +223,7 @@ static void usb_msd_transfer_data(SCSIRequest *req,
uint32_t len)
}
}
-static void usb_msd_command_complete(SCSIRequest *req, uint32_t status)
+static void usb_msd_command_complete(SCSIRequest *req, uint32_t status, size_t
resid)
{
MSDState *s = DO_UPCAST(MSDState, dev.qdev, req->bus->qbus.parent);
USBPacket *p = s->packet;
--
1.7.7.6
- [Qemu-devel] [PATCH v3 00/15] SCSI s/g + SCSI migration + virtio-scsi, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 01/15] dma-helpers: make QEMUSGList target independent, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 02/15] dma-helpers: add dma_buf_read and dma_buf_write, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 03/15] dma-helpers: add accounting wrappers, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 04/15] ahci: use new DMA helpers, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 05/15] scsi: pass residual amount to command_complete,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 07/15] scsi-disk: enable scatter/gather functionality, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 06/15] scsi: add scatter/gather functionality, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 08/15] scsi: add SCSIDevice vmstate definitions, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 09/15] scsi-generic: add migration support, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 15/15] virtio-scsi: add migration support, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 10/15] scsi-disk: add migration support, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 13/15] virtio-scsi: add basic SCSI bus operation, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 12/15] virtio-scsi: Add basic request processing infrastructure, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 14/15] virtio-scsi: process control queue requests, Paolo Bonzini, 2012/02/13
- [Qemu-devel] [PATCH v3 11/15] virtio-scsi: Add virtio-scsi stub device, Paolo Bonzini, 2012/02/13