summaryrefslogtreecommitdiffstats
path: root/hw/scsi/mptsas.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/mptsas.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/mptsas.c')
-rw-r--r--hw/scsi/mptsas.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
index f86616544b..7416e78706 100644
--- a/hw/scsi/mptsas.c
+++ b/hw/scsi/mptsas.c
@@ -1133,7 +1133,7 @@ static QEMUSGList *mptsas_get_sg_list(SCSIRequest *sreq)
}
static void mptsas_command_complete(SCSIRequest *sreq,
- uint32_t status, size_t resid)
+ size_t resid)
{
MPTSASRequest *req = sreq->hba_private;
MPTSASState *s = req->dev;
@@ -1143,7 +1143,8 @@ static void mptsas_command_complete(SCSIRequest *sreq,
hwaddr sense_buffer_addr = req->dev->sense_buffer_high_addr |
req->scsi_io.SenseBufferLowAddr;
- trace_mptsas_command_complete(s, req->scsi_io.MsgContext, status, resid);
+ trace_mptsas_command_complete(s, req->scsi_io.MsgContext,
+ sreq->status, resid);
sense_len = scsi_req_get_sense(sreq, sense_buf, SCSI_SENSE_BUF_SIZE);
if (sense_len > 0) {