diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-16 22:29:51 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-16 22:29:51 +0000 |
| commit | bce36c6c5436c0c2679b42c6de54de5393dfcf59 (patch) | |
| tree | d42fbebb76a47201f85b1e95fa85ac01cee03c2a /hw | |
| parent | b17d3b7b77f043f0e76f0e6ce6def3c1b1d5ee8b (diff) | |
| parent | 1370d61ae3c9934861d2349349447605202f04e9 (diff) | |
| download | qemu-bce36c6c5436c0c2679b42c6de54de5393dfcf59.zip qemu-bce36c6c5436c0c2679b42c6de54de5393dfcf59.tar.gz qemu-bce36c6c5436c0c2679b42c6de54de5393dfcf59.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
Bug fixes
# gpg: Signature made Mon 16 Nov 2020 18:22:51 GMT
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini-gitlab/tags/for-upstream:
memory: Skip dirty tracking for un-migratable memory regions
target/i386: avoid theoretical leak on MCE injection
scsi-disk: convert more errno values back to SCSI statuses
util/vfio-helpers.c: Use ram_block_discard_disable() in qemu_vfio_open_pci()
kvm/i386: Set proper nested state format for SVM
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/scsi/scsi-disk.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index e859534..90841ad 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -461,6 +461,25 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_failed) } error = scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.sense)); break; +#ifdef CONFIG_LINUX + /* These errno mapping are specific to Linux. For more information: + * - scsi_decide_disposition in drivers/scsi/scsi_error.c + * - scsi_result_to_blk_status in drivers/scsi/scsi_lib.c + * - blk_errors[] in block/blk-core.c + */ + case EBADE: + /* DID_NEXUS_FAILURE -> BLK_STS_NEXUS. */ + scsi_req_complete(&r->req, RESERVATION_CONFLICT); + break; + case ENODATA: + /* DID_MEDIUM_ERROR -> BLK_STS_MEDIUM. */ + scsi_check_condition(r, SENSE_CODE(READ_ERROR)); + break; + case EREMOTEIO: + /* DID_TARGET_FAILURE -> BLK_STS_TARGET. */ + scsi_req_complete(&r->req, HARDWARE_ERROR); + break; +#endif case ENOMEDIUM: scsi_check_condition(r, SENSE_CODE(NO_MEDIUM)); break; |