summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorFam Zheng2016-05-26 08:15:05 +0200
committerPaolo Bonzini2016-05-29 09:11:12 +0200
commit063143d5b1fde0fdcbae30bc7d6d14e76fa607d2 (patch)
tree92ab686139cca9e920418b73c281c70f99bd4a89 /hw
parentscsi-block: always use SG_IO (diff)
downloadqemu-063143d5b1fde0fdcbae30bc7d6d14e76fa607d2.tar.gz
qemu-063143d5b1fde0fdcbae30bc7d6d14e76fa607d2.tar.xz
qemu-063143d5b1fde0fdcbae30bc7d6d14e76fa607d2.zip
scsi-generic: Merge block max xfer len in INQUIRY response
The rationale is similar to the above mode sense response interception: this is practically the only channel to communicate restraints from elsewhere such as host and block driver. The scsi bus we attach onto can have a larger max xfer len than what is accepted by the host file system (guarding between the host scsi LUN and QEMU), in which case the SG_IO we generate would get -EINVAL. Signed-off-by: Fam Zheng <famz@redhat.com> Message-Id: <1464243305-10661-3-git-send-email-famz@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/scsi/scsi-generic.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index 7459465f60..71372a8383 100644
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -222,6 +222,18 @@ static void scsi_read_complete(void * opaque, int ret)
r->buf[3] |= 0x80;
}
}
+ if (s->type == TYPE_DISK &&
+ r->req.cmd.buf[0] == INQUIRY &&
+ r->req.cmd.buf[2] == 0xb0) {
+ uint32_t max_xfer_len = blk_get_max_transfer_length(s->conf.blk);
+ if (max_xfer_len) {
+ stl_be_p(&r->buf[8], max_xfer_len);
+ /* Also take care of the opt xfer len. */
+ if (ldl_be_p(&r->buf[12]) > max_xfer_len) {
+ stl_be_p(&r->buf[12], max_xfer_len);
+ }
+ }
+ }
scsi_req_data(&r->req, len);
scsi_req_unref(&r->req);
}