[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/29] scsi-disk: do not complete requests early for rerror/werror
From: |
Paolo Bonzini |
Subject: |
[PULL 09/29] scsi-disk: do not complete requests early for rerror/werror=ignore |
Date: |
Fri, 26 Feb 2021 09:05:06 +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
- [PULL 20/29] qemu-options: update to show preferred boolean syntax for -vnc, (continued)
- [PULL 20/29] qemu-options: update to show preferred boolean syntax for -vnc, Paolo Bonzini, 2021/02/26
- [PULL 21/29] docs: update to show preferred boolean syntax for -chardev, Paolo Bonzini, 2021/02/26
- [PULL 23/29] docs: update to show preferred boolean syntax for -cpu, Paolo Bonzini, 2021/02/26
- [PULL 28/29] chardev: do not use short form boolean options in non-QemuOpts character device descriptions, Paolo Bonzini, 2021/02/26
- [PULL 26/29] target/i386: Add bus lock debug exception support, Paolo Bonzini, 2021/02/26
- [PULL 29/29] tcg/i386: rdpmc: fix the the condtions, Paolo Bonzini, 2021/02/26
- [PULL 04/29] scsi: make io_timeout configurable, Paolo Bonzini, 2021/02/26
- [PULL 08/29] scsi-disk: move scsi_handle_rw_error earlier, Paolo Bonzini, 2021/02/26
- [PULL 07/29] virtio-scsi: don't process IO on fenced dataplane, Paolo Bonzini, 2021/02/26
- [PULL 11/29] scsi-disk: pass SCSI status to scsi_handle_rw_error, Paolo Bonzini, 2021/02/26
- [PULL 09/29] scsi-disk: do not complete requests early for rerror/werror=ignore,
Paolo Bonzini <=
- [PULL 15/29] gdbstub: use preferred boolean option syntax, Paolo Bonzini, 2021/02/26
- [PULL 14/29] char: don't fail when client is not connected, Paolo Bonzini, 2021/02/26
- [PULL 19/29] qemu-options: update to show preferred boolean syntax for -incoming, Paolo Bonzini, 2021/02/26
- [PULL 22/29] docs: update to show preferred boolean syntax for -vnc, Paolo Bonzini, 2021/02/26
- [PULL 24/29] target/i386: update to show preferred boolean syntax for -cpu, Paolo Bonzini, 2021/02/26
- [PULL 25/29] qom/object.c: Fix typo, Paolo Bonzini, 2021/02/26
- [PULL 27/29] vl: deprecate -writeconfig, Paolo Bonzini, 2021/02/26
- Re: [PULL 00/29] Misc patches for 2021-02-25, no-reply, 2021/02/26