[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 15/25] scsi: introduce scsi_req_new
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v5 15/25] scsi: introduce scsi_req_new |
Date: |
Thu, 26 May 2011 12:56:41 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Christoph Hellwig <address@hidden>
---
hw/esp.c | 2 +-
hw/lsi53c895a.c | 3 +--
hw/scsi-bus.c | 5 +++++
hw/scsi.h | 1 +
hw/spapr_vscsi.c | 2 +-
hw/usb-msd.c | 2 +-
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/hw/esp.c b/hw/esp.c
index 49f3e7b..9f716e9 100644
--- a/hw/esp.c
+++ b/hw/esp.c
@@ -244,7 +244,7 @@ static void do_busid_cmd(ESPState *s, uint8_t *buf, uint8_t
busid)
DPRINTF("do_busid_cmd: busid 0x%x\n", busid);
lun = busid & 7;
- s->current_req = s->current_dev->info->alloc_req(s->current_dev, 0, lun);
+ s->current_req = scsi_req_new(s->current_dev, 0, lun);
datalen = scsi_req_enqueue(s->current_req, buf);
s->ti_size = datalen;
if (datalen != 0) {
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 538cb49..6d56e09 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -788,8 +788,7 @@ static void lsi_do_command(LSIState *s)
assert(s->current == NULL);
s->current = qemu_mallocz(sizeof(lsi_request));
s->current->tag = s->select_tag;
- s->current->req = dev->info->alloc_req(dev, s->current->tag,
- s->current_lun);
+ s->current->req = scsi_req_new(dev, s->current->tag, s->current_lun);
n = scsi_req_enqueue(s->current->req, buf);
if (n > 0) {
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index afec0c8..4506ac9 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -146,6 +146,11 @@ SCSIRequest *scsi_req_alloc(size_t size, SCSIDevice *d,
uint32_t tag, uint32_t l
return req;
}
+SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun)
+{
+ return d->info->alloc_req(d, tag, lun);
+}
+
int32_t scsi_req_enqueue(SCSIRequest *req, uint8_t *buf)
{
int32_t rc;
diff --git a/hw/scsi.h b/hw/scsi.h
index 839bc0b..928cbf3 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -143,6 +143,7 @@ int scsi_build_sense(SCSISense sense, uint8_t *buf, int
len, int fixed);
int scsi_sense_valid(SCSISense sense);
SCSIRequest *scsi_req_alloc(size_t size, SCSIDevice *d, uint32_t tag, uint32_t
lun);
+SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun);
int32_t scsi_req_enqueue(SCSIRequest *req, uint8_t *buf);
void scsi_req_free(SCSIRequest *req);
SCSIRequest *scsi_req_ref(SCSIRequest *req);
diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c
index 125a454..8032a17 100644
--- a/hw/spapr_vscsi.c
+++ b/hw/spapr_vscsi.c
@@ -653,7 +653,7 @@ static int vscsi_queue_cmd(VSCSIState *s, vscsi_req *req)
req->sdev = sdev;
req->lun = lun;
- req->sreq = sdev->info->alloc_req(sdev, req->qtag, lun);
+ req->sreq = scsi_req_new(sdev, req->qtag, lun);
n = scsi_req_enqueue(req->sreq, srp->cmd.cdb);
dprintf("VSCSI: Queued command tag 0x%x CMD 0x%x ID %d LUN %d ret: %d\n",
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index ccfae61..efb15b0 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -377,7 +377,7 @@ static int usb_msd_handle_data(USBDevice *dev, USBPacket *p)
s->tag, cbw.flags, cbw.cmd_len, s->data_len);
s->residue = 0;
s->scsi_len = 0;
- s->req = s->scsi_dev->info->alloc_req(s->scsi_dev, s->tag, 0);
+ s->req = scsi_req_new(s->scsi_dev, s->tag, 0);
scsi_req_enqueue(s->req, cbw.cmd);
/* ??? Should check that USB and SCSI data transfer
directions match. */
--
1.7.4.4
- [Qemu-devel] [PATCH v5 12/25] scsi: use scsi_req_complete, (continued)
- [Qemu-devel] [PATCH v5 12/25] scsi: use scsi_req_complete, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 09/25] scsi: commonize purging requests, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 11/25] scsi: introduce scsi_req_cancel, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 13/25] scsi: Update sense code handling, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 14/25] scsi: do not call send_command directly, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 16/25] scsi: introduce scsi_req_continue, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 17/25] scsi: introduce scsi_req_get_buf, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 08/25] scsi: Use 'SCSIRequest' directly, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 18/25] scsi: Implement 'get_sense' callback, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 15/25] scsi: introduce scsi_req_new,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v5 19/25] scsi-disk: add data direction checking, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 21/25] scsi-generic: Handle queue full, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 22/25] esp: rename sense to status, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 23/25] scsi: split command_complete callback in two, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 24/25] scsi: rename arguments to the new callbacks, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 25/25] scsi: ignore LUN field in the CDB, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 05/25] scsi-generic: do not use a stale aiocb, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 20/25] scsi: make write_data return void, Paolo Bonzini, 2011/05/26
- Re: [Qemu-devel] [PULL v5 00/25] SCSI subsystem improvements, Anthony Liguori, 2011/05/31