[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 16/21] scsi: introduce scsi_req_get_buf
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 16/21] scsi: introduce scsi_req_get_buf |
Date: |
Mon, 16 May 2011 14:16:32 +0200 |
... and remove some SCSIDevice variables or fields that now become unused.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/esp.c | 2 +-
hw/lsi53c895a.c | 2 +-
hw/scsi-bus.c | 5 +++++
hw/scsi.h | 1 +
hw/spapr_vscsi.c | 8 ++------
hw/usb-msd.c | 2 +-
6 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/hw/esp.c b/hw/esp.c
index 1f342f8..051b0fa 100644
--- a/hw/esp.c
+++ b/hw/esp.c
@@ -419,7 +419,7 @@ static void esp_command_complete(SCSIRequest *req, int
reason, uint32_t arg)
} else {
DPRINTF("transfer %d/%d\n", s->dma_left, s->ti_size);
s->async_len = arg;
- s->async_buf = s->current_dev->info->get_buf(req);
+ s->async_buf = scsi_req_get_buf(req);
if (s->dma_left) {
esp_do_dma(s);
} else if (s->dma_counter != 0 && s->ti_size <= 0) {
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 1e72151..e51a944 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -569,7 +569,7 @@ static void lsi_do_dma(LSIState *s, int out)
s->dnad += count;
s->dbc -= count;
if (s->current->dma_buf == NULL) {
- s->current->dma_buf = dev->info->get_buf(s->current->req);
+ s->current->dma_buf = scsi_req_get_buf(s->current->req);
}
/* ??? Set SFBR to first data byte. */
if (out) {
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index ed2839a..417dc77 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -151,6 +151,11 @@ SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag,
uint32_t lun)
return d->info->alloc_req(d, tag, lun);
}
+uint8_t *scsi_req_get_buf(SCSIRequest *req)
+{
+ return req->dev->info->get_buf(req);
+}
+
int32_t scsi_req_enqueue(SCSIRequest *req, uint8_t *buf)
{
assert(!req->enqueued);
diff --git a/hw/scsi.h b/hw/scsi.h
index f659503..3af6295 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -154,6 +154,7 @@ void scsi_req_print(SCSIRequest *req);
void scsi_req_kick(SCSIRequest *req);
void scsi_req_data(SCSIRequest *req, int len);
void scsi_req_complete(SCSIRequest *req);
+uint8_t *scsi_req_get_buf(SCSIRequest *req);
void scsi_req_abort(SCSIRequest *req, int status);
void scsi_req_cancel(SCSIRequest *req);
void scsi_device_purge_requests(SCSIDevice *sdev);
diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c
index 27c8e17..46cd1d7 100644
--- a/hw/spapr_vscsi.c
+++ b/hw/spapr_vscsi.c
@@ -74,7 +74,6 @@ typedef struct vscsi_req {
union viosrp_iu iu;
/* SCSI request tracking */
- SCSIDevice *sdev;
SCSIRequest *sreq;
uint32_t qtag; /* qemu tag != srp tag */
int lun;
@@ -476,7 +475,6 @@ static void vscsi_command_complete(SCSIRequest *sreq, int
reason, uint32_t arg)
{
VSCSIState *s = DO_UPCAST(VSCSIState, vdev.qdev, sreq->bus->qbus.parent);
vscsi_req *req = vscsi_find_req(s, sreq);
- SCSIDevice *sdev;
uint8_t *buf;
int32_t res_in = 0, res_out = 0;
int len, rc = 0;
@@ -487,7 +485,6 @@ static void vscsi_command_complete(SCSIRequest *sreq, int
reason, uint32_t arg)
fprintf(stderr, "VSCSI: Can't find request for tag 0x%x\n", sreq->tag);
return;
}
- sdev = req->sdev;
if (req->sensing) {
if (reason == SCSI_REASON_DONE) {
@@ -495,7 +492,7 @@ static void vscsi_command_complete(SCSIRequest *sreq, int
reason, uint32_t arg)
vscsi_send_rsp(s, req, CHECK_CONDITION, 0, 0);
vscsi_put_req(s, req);
} else {
- uint8_t *buf = sdev->info->get_buf(sreq);
+ uint8_t *buf = scsi_req_get_buf(sreq);
len = MIN(arg, SCSI_SENSE_BUF_SIZE);
dprintf("VSCSI: Sense data, %d bytes:\n", len);
@@ -539,7 +536,7 @@ static void vscsi_command_complete(SCSIRequest *sreq, int
reason, uint32_t arg)
* to write for writes (ie, how much is to be DMA'd)
*/
if (arg) {
- buf = sdev->info->get_buf(sreq);
+ buf = scsi_req_get_buf(sreq);
rc = vscsi_srp_transfer_data(s, req, req->writing, buf, arg);
}
if (rc < 0) {
@@ -646,7 +643,6 @@ static int vscsi_queue_cmd(VSCSIState *s, vscsi_req *req)
} return 1;
}
- req->sdev = sdev;
req->lun = lun;
req->sreq = scsi_req_new(sdev, req->qtag, lun);
n = scsi_req_enqueue(req->sreq, srp->cmd.cdb);
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index e307c80..14e42e5 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -247,7 +247,7 @@ static void usb_msd_command_complete(SCSIRequest *req, int
reason, uint32_t arg)
}
assert((s->mode == USB_MSDM_DATAOUT) == (req->cmd.mode ==
SCSI_XFER_TO_DEV));
s->scsi_len = arg;
- s->scsi_buf = s->scsi_dev->info->get_buf(req);
+ s->scsi_buf = scsi_req_get_buf(req);
if (p) {
usb_msd_copy_data(s);
if (s->usb_len == 0) {
--
1.7.4.4
- [Qemu-devel] [PATCH v2 05/21] scsi: reference-count requests, (continued)
- [Qemu-devel] [PATCH v2 05/21] scsi: reference-count requests, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 06/21] lsi: extract lsi_find_by_tag, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 07/21] scsi: Use 'SCSIRequest' directly, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 09/21] scsi: introduce scsi_req_abort, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 08/21] scsi: commonize purging requests, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 10/21] scsi: introduce scsi_req_cancel, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 11/21] scsi: use scsi_req_complete, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 12/21] scsi: Update sense code handling, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 13/21] scsi: do not call send_command directly, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 14/21] scsi: introduce scsi_req_new, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 16/21] scsi: introduce scsi_req_get_buf,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 15/21] scsi: introduce scsi_req_kick, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 17/21] scsi: Implement 'get_sense' callback, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 18/21] scsi-disk: add data direction checking, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 19/21] scsi: make write_data return void, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 20/21] scsi-generic: Handle queue full, Paolo Bonzini, 2011/05/16
- [Qemu-devel] [PATCH v2 21/21] scsi: split command_complete callback in two, Paolo Bonzini, 2011/05/16