haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

scsi: pass cdb already to scsi_req_new

Browse source 
Right now the CDB is not passed to the SCSIBus until scsi_req_enqueue.
Passing it to scsi_req_new will let scsi_req_new dispatch common requests
through different reqops.

Moving the memcpy to scsi_req_new is a hack that will go away as
soon as scsi_req_new will also take care of the parsing.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2011-08-03 10:49:10 +02:00 committed by Anthony Liguori
parent 12010e7b29
commit c39ce112b6
6 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hw/esp.c
View file

@ -244,8 +244,8 @@ static void do_busid_cmd(ESPState *s, uint8_t *buf, uint8_t busid)
DPRINTF("do_busid_cmd: busid 0x%x\n", busid); DPRINTF("do_busid_cmd: busid 0x%x\n", busid);
lun = busid & 7; lun = busid & 7;
s->current_req = scsi_req_new(s->current_dev, 0, lun, NULL); s->current_req = scsi_req_new(s->current_dev, 0, lun, buf, NULL);
datalen = scsi_req_enqueue(s->current_req, buf); datalen = scsi_req_enqueue(s->current_req);
s->ti_size = datalen; s->ti_size = datalen;
if (datalen != 0) { if (datalen != 0) {
s->rregs[ESP_RSTAT] = STAT_TC; s->rregs[ESP_RSTAT] = STAT_TC;

4
hw/lsi53c895a.c
View file

@ -781,10 +781,10 @@ static void lsi_do_command(LSIState *s)
assert(s->current == NULL); assert(s->current == NULL);
s->current = qemu_mallocz(sizeof(lsi_request)); s->current = qemu_mallocz(sizeof(lsi_request));
s->current->tag = s->select_tag; s->current->tag = s->select_tag;
s->current->req = scsi_req_new(dev, s->current->tag, s->current_lun, s->current->req = scsi_req_new(dev, s->current->tag, s->current_lun, buf,
s->current); s->current);
n = scsi_req_enqueue(s->current->req, buf); n = scsi_req_enqueue(s->current->req);
if (n) { if (n) {
if (n > 0) { if (n > 0) {
lsi_set_phase(s, PHASE_DI); lsi_set_phase(s, PHASE_DI);

13
hw/scsi-bus.c
View file

@ -153,9 +153,12 @@ SCSIRequest *scsi_req_alloc(SCSIReqOps *reqops, SCSIDevice *d, uint32_t tag,
} }
SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun, SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun,
void *hba_private) uint8_t *buf, void *hba_private)
{ {
return d->info->alloc_req(d, tag, lun, hba_private); SCSIRequest *req;
req = d->info->alloc_req(d, tag, lun, hba_private);
memcpy(req->cmd.buf, buf, 16);
return req;
} }
uint8_t *scsi_req_get_buf(SCSIRequest *req) uint8_t *scsi_req_get_buf(SCSIRequest *req)
@ -189,7 +192,7 @@ void scsi_req_build_sense(SCSIRequest *req, SCSISense sense)
req->sense_len = 18; req->sense_len = 18;
} }
int32_t scsi_req_enqueue(SCSIRequest *req, uint8_t *buf) int32_t scsi_req_enqueue(SCSIRequest *req)
{ {
int32_t rc; int32_t rc;
@ -199,7 +202,7 @@ int32_t scsi_req_enqueue(SCSIRequest *req, uint8_t *buf)
QTAILQ_INSERT_TAIL(&req->dev->requests, req, next); QTAILQ_INSERT_TAIL(&req->dev->requests, req, next);
scsi_req_ref(req); scsi_req_ref(req);
rc = req->ops->send_command(req, buf); rc = req->ops->send_command(req, req->cmd.buf);
scsi_req_unref(req); scsi_req_unref(req);
return rc; return rc;
} }
@ -431,7 +434,7 @@ int scsi_req_parse(SCSIRequest *req, uint8_t *buf)
if (rc != 0) if (rc != 0)
return rc; return rc;
memcpy(req->cmd.buf, buf, req->cmd.len); assert(buf == req->cmd.buf);
scsi_req_xfer_mode(req); scsi_req_xfer_mode(req);
req->cmd.lba = scsi_req_lba(req); req->cmd.lba = scsi_req_lba(req);
trace_scsi_req_parsed(req->dev->id, req->lun, req->tag, buf[0], trace_scsi_req_parsed(req->dev->id, req->lun, req->tag, buf[0],

4
hw/scsi.h
View file

@ -154,8 +154,8 @@ int scsi_sense_valid(SCSISense sense);
SCSIRequest *scsi_req_alloc(SCSIReqOps *reqops, SCSIDevice *d, uint32_t tag, SCSIRequest *scsi_req_alloc(SCSIReqOps *reqops, SCSIDevice *d, uint32_t tag,
uint32_t lun, void *hba_private); uint32_t lun, void *hba_private);
SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun, SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun,
void *hba_private); uint8_t *buf, void *hba_private);
int32_t scsi_req_enqueue(SCSIRequest *req, uint8_t *buf); int32_t scsi_req_enqueue(SCSIRequest *req);
void scsi_req_free(SCSIRequest *req); void scsi_req_free(SCSIRequest *req);
SCSIRequest *scsi_req_ref(SCSIRequest *req); SCSIRequest *scsi_req_ref(SCSIRequest *req);
void scsi_req_unref(SCSIRequest *req); void scsi_req_unref(SCSIRequest *req);

4
hw/spapr_vscsi.c
View file

@ -600,8 +600,8 @@ static int vscsi_queue_cmd(VSCSIState *s, vscsi_req *req)
} }
req->lun = lun; req->lun = lun;
req->sreq = scsi_req_new(sdev, req->qtag, lun, req); req->sreq = scsi_req_new(sdev, req->qtag, lun, srp->cmd.cdb, req);
n = scsi_req_enqueue(req->sreq, srp->cmd.cdb); n = scsi_req_enqueue(req->sreq);
dprintf("VSCSI: Queued command tag 0x%x CMD 0x%x ID %d LUN %d ret: %d\n", dprintf("VSCSI: Queued command tag 0x%x CMD 0x%x ID %d LUN %d ret: %d\n",
req->qtag, srp->cmd.cdb[0], id, lun, n); req->qtag, srp->cmd.cdb[0], id, lun, n);

4
hw/usb-msd.c
View file

@ -370,8 +370,8 @@ static int usb_msd_handle_data(USBDevice *dev, USBPacket *p)
s->tag, cbw.flags, cbw.cmd_len, s->data_len); s->tag, cbw.flags, cbw.cmd_len, s->data_len);
s->residue = 0; s->residue = 0;
s->scsi_len = 0; s->scsi_len = 0;
s->req = scsi_req_new(s->scsi_dev, s->tag, 0, NULL); s->req = scsi_req_new(s->scsi_dev, s->tag, 0, cbw.cmd, NULL);
scsi_req_enqueue(s->req, cbw.cmd); scsi_req_enqueue(s->req);
/* ??? Should check that USB and SCSI data transfer /* ??? Should check that USB and SCSI data transfer
directions match. */ directions match. */
if (s->mode != USB_MSDM_CSW && s->residue == 0) { if (s->mode != USB_MSDM_CSW && s->residue == 0) {