[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/19] scsi-disk: pass sense correctly for guest-reco
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 01/19] scsi-disk: pass sense correctly for guest-recoverable errors |
Date: |
Tue, 16 Jul 2019 10:10:59 +0200 |
From: Shinichiro Kawasaki <address@hidden>
When an error was passed down to the guest because it was recoverable,
the sense length was not copied from the SG_IO data. As a result,
the guest saw the CHECK CONDITION status but not the sense data.
Signed-off-by: Shinichiro Kawasaki <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/scsi-disk.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index ed7295b..5d3fb3c 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -62,6 +62,7 @@ typedef struct SCSIDiskClass {
DMAIOFunc *dma_readv;
DMAIOFunc *dma_writev;
bool (*need_fua_emulation)(SCSICommand *cmd);
+ void (*update_sense)(SCSIRequest *r);
} SCSIDiskClass;
typedef struct SCSIDiskReq {
@@ -438,6 +439,7 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int error,
bool acct_failed)
{
bool is_read = (r->req.cmd.mode == SCSI_XFER_FROM_DEV);
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
+ SCSIDiskClass *sdc = (SCSIDiskClass *) object_get_class(OBJECT(s));
BlockErrorAction action = blk_get_error_action(s->qdev.conf.blk,
is_read, error);
@@ -456,6 +458,7 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int error,
bool acct_failed)
if (error == ECANCELED || error == EAGAIN || error == ENOTCONN ||
error == 0) {
/* These errors are handled by guest. */
+ sdc->update_sense(&r->req);
scsi_req_complete(&r->req, *r->status);
return true;
}
@@ -2894,6 +2897,12 @@ static int scsi_block_parse_cdb(SCSIDevice *d,
SCSICommand *cmd,
}
}
+static void scsi_block_update_sense(SCSIRequest *req)
+{
+ SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req);
+ SCSIBlockReq *br = DO_UPCAST(SCSIBlockReq, req, r);
+ r->req.sense_len = MIN(br->io_header.sb_len_wr, sizeof(r->req.sense));
+}
#endif
static
@@ -3059,6 +3068,7 @@ static void scsi_block_class_initfn(ObjectClass *klass,
void *data)
sc->parse_cdb = scsi_block_parse_cdb;
sdc->dma_readv = scsi_block_dma_readv;
sdc->dma_writev = scsi_block_dma_writev;
+ sdc->update_sense = scsi_block_update_sense;
sdc->need_fua_emulation = scsi_block_no_fua;
dc->desc = "SCSI block device passthrough";
dc->props = scsi_block_properties;
--
1.8.3.1
- [Qemu-devel] [PULL 00/19] Bugfix/cleanup patches for 2019-07-16, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 01/19] scsi-disk: pass sense correctly for guest-recoverable errors,
Paolo Bonzini <=
- [Qemu-devel] [PULL 02/19] scsi: explicitly list guest-recoverable sense codes, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 03/19] scsi: add guest-recoverable ZBC errors, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 04/19] iscsi: fix busy/timeout/task set full, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 05/19] iscsi: base all handling of check condition on scsi_sense_to_errno, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 06/19] build-sys: remove slirp cflags from main-loop.o, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 07/19] rdmacm-mux: fix strcpy string warning, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 08/19] hw/i386: turn off vmport if CONFIG_VMPORT is disabled, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 09/19] memory: unref the memory region in simplify flatview, Paolo Bonzini, 2019/07/16