From 2ac68533ce20bd5d34bacfd982e61baa02761680 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 29 Jul 2014 15:39:59 -0500 Subject: [CHANGE 3/9] scsi-bus: prepare scsi_req_new for introduction of parse_cdb To: rhvirt-patches@redhat.com, jen@redhat.com RH-Author: Paolo Bonzini Message-id: <1406648403-29466-2-git-send-email-pbonzini@redhat.com> Patchwork-id: 60301 O-Subject: [RHEL 6.6/6.5.z qemu-kvm PATCH 1/5] scsi-bus: prepare scsi_req_new for introduction of parse_cdb Bugzilla: 1125131 RH-Acked-by: Juan Quintela RH-Acked-by: Markus Armbruster RH-Acked-by: Fam Zheng The per-SCSIDevice parse_cdb callback must not be called if the request will go through special SCSIReqOps, so detect the special cases early enough. Signed-off-by: Paolo Bonzini (cherry picked from commit 769998a1dbf338a0cdeab2acf8ef605bcf635e01) Signed-off-by: jen Conflicts: hw/scsi-bus.c [missing check on cmd->xfer in RHEL6] --- hw/scsi-bus.c | 51 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) Signed-off-by: jen --- hw/scsi-bus.c | 51 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 6a93d11..f75f565 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -516,13 +516,38 @@ SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun, uint8_t *buf, void *hba_private) { SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, d->qdev.parent_bus); + const SCSIReqOps *ops; SCSIRequest *req; - SCSICommand cmd; + SCSICommand cmd = { .len = 0 }; + int ret; - if (scsi_req_parse(&cmd, d, buf) != 0) { + if ((d->unit_attention.key == UNIT_ATTENTION || + bus->unit_attention.key == UNIT_ATTENTION) && + (buf[0] != INQUIRY && + buf[0] != REPORT_LUNS && + buf[0] != GET_CONFIGURATION && + buf[0] != GET_EVENT_STATUS_NOTIFICATION && + + /* + * If we already have a pending unit attention condition, + * report this one before triggering another one. + */ + !(buf[0] == REQUEST_SENSE && d->sense_is_ua))) { + ops = &reqops_unit_attention; + } else if (lun != d->lun || + buf[0] == REPORT_LUNS || + (buf[0] == REQUEST_SENSE && d->sense_len)) { + ops = &reqops_target_command; + } else { + ops = NULL; + } + + ret = scsi_req_parse(&cmd, d, buf); + if (ret != 0) { trace_scsi_req_parse_bad(d->id, lun, tag, buf[0]); req = scsi_req_alloc(&reqops_invalid_opcode, d, tag, lun, hba_private); } else { + assert(cmd.len != 0); trace_scsi_req_parsed(d->id, lun, tag, buf[0], cmd.mode, cmd.xfer); if (cmd.lba != -1) { @@ -530,25 +555,8 @@ SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun, cmd.lba); } - if ((d->unit_attention.key == UNIT_ATTENTION || - bus->unit_attention.key == UNIT_ATTENTION) && - (buf[0] != INQUIRY && - buf[0] != REPORT_LUNS && - buf[0] != GET_CONFIGURATION && - buf[0] != GET_EVENT_STATUS_NOTIFICATION && - - /* - * If we already have a pending unit attention condition, - * report this one before triggering another one. - */ - !(buf[0] == REQUEST_SENSE && d->sense_is_ua))) { - req = scsi_req_alloc(&reqops_unit_attention, d, tag, lun, - hba_private); - } else if (lun != d->lun || - buf[0] == REPORT_LUNS || - (buf[0] == REQUEST_SENSE && d->sense_len)) { - req = scsi_req_alloc(&reqops_target_command, d, tag, lun, - hba_private); + if (ops) { + req = scsi_req_alloc(ops, d, tag, lun, hba_private); } else { req = d->info->alloc_req(d, tag, lun, buf, hba_private); } @@ -1002,6 +1010,7 @@ int scsi_req_parse(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf) { int rc; + cmd->lba = -1; if (dev->type == TYPE_TAPE) { rc = scsi_req_stream_length(cmd, dev, buf); } else { -- 1.9.3