trace: Fix incorrect megasas trace parameters
hw/scsi/trace-events lists cmd as the first parameter for both
megasas_iovec_overflow and megasas_iovec_underflow, but the caller
was mistakenly passing cmd->iov_size twice instead of the command
index. Also, trace_megasas_abort_invalid is called with parameters
in the wrong order. Broken since its introduction in commit
e8f943c3
.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
67adf4b398
commit
d17e744848
|
@ -291,7 +291,7 @@ static int megasas_map_sgl(MegasasState *s, MegasasCmd *cmd, union mfi_sgl *sgl)
|
||||||
if (cmd->iov_size > iov_size) {
|
if (cmd->iov_size > iov_size) {
|
||||||
trace_megasas_iovec_overflow(cmd->index, iov_size, cmd->iov_size);
|
trace_megasas_iovec_overflow(cmd->index, iov_size, cmd->iov_size);
|
||||||
} else if (cmd->iov_size < iov_size) {
|
} else if (cmd->iov_size < iov_size) {
|
||||||
trace_megasas_iovec_underflow(cmd->iov_size, iov_size, cmd->iov_size);
|
trace_megasas_iovec_underflow(cmd->index, iov_size, cmd->iov_size);
|
||||||
}
|
}
|
||||||
cmd->iov_offset = 0;
|
cmd->iov_offset = 0;
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1924,8 +1924,8 @@ static int megasas_handle_abort(MegasasState *s, MegasasCmd *cmd)
|
||||||
abort_ctx &= (uint64_t)0xFFFFFFFF;
|
abort_ctx &= (uint64_t)0xFFFFFFFF;
|
||||||
}
|
}
|
||||||
if (abort_cmd->context != abort_ctx) {
|
if (abort_cmd->context != abort_ctx) {
|
||||||
trace_megasas_abort_invalid_context(cmd->index, abort_cmd->index,
|
trace_megasas_abort_invalid_context(cmd->index, abort_cmd->context,
|
||||||
abort_cmd->context);
|
abort_cmd->index);
|
||||||
s->event_count++;
|
s->event_count++;
|
||||||
return MFI_STAT_ABORT_NOT_POSSIBLE;
|
return MFI_STAT_ABORT_NOT_POSSIBLE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue