summaryrefslogtreecommitdiffstats
path: root/hw/scsi/esp.c
diff options
context:
space:
mode:
authorHannes Reinecke2020-11-16 19:40:36 +0100
committerPaolo Bonzini2021-02-25 14:14:32 +0100
commit17ea26c2d80a695b4d3af9ae2eaa438095029773 (patch)
treee771a7d7468347641ae40eb0262deaeebc950fdb /hw/scsi/esp.c
parentscsi-disk: pass guest recoverable errors through even for rerror=stop (diff)
downloadqemu-17ea26c2d80a695b4d3af9ae2eaa438095029773.tar.gz
qemu-17ea26c2d80a695b4d3af9ae2eaa438095029773.tar.xz
qemu-17ea26c2d80a695b4d3af9ae2eaa438095029773.zip
scsi: drop 'result' argument from command_complete callback
The command complete callback has a SCSIRequest as the first argument, and the status field of that structure is identical to the 'status' argument. So drop the argument from the callback. Signed-off-by: Hannes Reinecke <hare@suse.de> Message-Id: <20201116184041.60465-3-hare@suse.de> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/scsi/esp.c')
-rw-r--r--hw/scsi/esp.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index b84e0fe33e..93d9c9c7b9 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -485,8 +485,7 @@ static void esp_report_command_complete(ESPState *s, uint32_t status)
}
}
-void esp_command_complete(SCSIRequest *req, uint32_t status,
- size_t resid)
+void esp_command_complete(SCSIRequest *req, size_t resid)
{
ESPState *s = req->hba_private;
@@ -495,11 +494,11 @@ void esp_command_complete(SCSIRequest *req, uint32_t status,
* interrupt has been handled.
*/
trace_esp_command_complete_deferred();
- s->deferred_status = status;
+ s->deferred_status = req->status;
s->deferred_complete = true;
return;
}
- esp_report_command_complete(s, status);
+ esp_report_command_complete(s, req->status);
}
void esp_transfer_data(SCSIRequest *req, uint32_t len)