[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/10] scsi-disk: do not complete requests early for rerror/werro
From: |
Paolo Bonzini |
Subject: |
[PATCH 02/10] scsi-disk: do not complete requests early for rerror/werror=ignore |
Date: |
Wed, 24 Feb 2021 19:24:45 +0100 |
When requested to ignore errors, just do nothing and let the
request complete normally. This means that the request will
be accounted correctly.
This is what commit 40dce4ee61 ("scsi-disk: fix rerror/werror=ignore",
2018-10-19) was supposed to do:
Fixes: 40dce4ee61 ("scsi-disk: fix rerror/werror=ignore", 2018-10-19)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/scsi/scsi-disk.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 18ab777017..36aa872445 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -253,8 +253,7 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int error,
bool acct_failed)
blk_error_action(s->qdev.conf.blk, action, is_read, error);
if (action == BLOCK_ERROR_ACTION_IGNORE) {
- scsi_req_complete(&r->req, 0);
- return true;
+ return false;
}
if (action == BLOCK_ERROR_ACTION_STOP) {
--
2.29.2
- [PATCH 00/11] scsi-generic: error handling overhaul, Paolo Bonzini, 2021/02/24
- [PATCH 02/10] scsi-disk: do not complete requests early for rerror/werror=ignore,
Paolo Bonzini <=
- [PATCH 04/10] scsi-disk: pass SCSI status to scsi_handle_rw_error, Paolo Bonzini, 2021/02/24
- [PATCH 03/10] scsi: introduce scsi_sense_from_errno(), Paolo Bonzini, 2021/02/24
- [PATCH 05/10] scsi-disk: pass guest recoverable errors through even for rerror=stop, Paolo Bonzini, 2021/02/24
- [PATCH 07/10] scsi: Rename linux-specific SG_ERR codes to generic SCSI_HOST error codes, Paolo Bonzini, 2021/02/24
- [PATCH 09/10] scsi: inline sg_io_sense_from_errno() into the callers., Paolo Bonzini, 2021/02/24
- [PATCH 10/10] scsi: move host_status handling into SCSI drivers, Paolo Bonzini, 2021/02/24
- [PATCH 06/10] scsi: drop 'result' argument from command_complete callback, Paolo Bonzini, 2021/02/24
- [PATCH 01/10] scsi-disk: move scsi_handle_rw_error earlier, Paolo Bonzini, 2021/02/24
- [PATCH 08/10] scsi: Add mapping for generic SCSI_HOST status to sense codes, Paolo Bonzini, 2021/02/24
- Re: [PATCH 00/11] scsi-generic: error handling overhaul, Philippe Mathieu-Daudé, 2021/02/24