Re: [Qemu-block] [PATCH v2 02/30] trace: Fix incorrect megasas trace parameters

[Hannes Reinecke]

On 03/13/2017 08:55 PM, Eric Blake wrote:
> 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 <address@hidden>
> ---
>  hw/scsi/megasas.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
> index e3d59b7..84b8caf 100644
> --- a/hw/scsi/megasas.c
> +++ b/hw/scsi/megasas.c
> @@ -291,7 +291,7 @@ static int megasas_map_sgl(MegasasState *s, MegasasCmd 
> *cmd, union mfi_sgl *sgl)
>      if (cmd->iov_size > iov_size) {
>          trace_megasas_iovec_overflow(cmd->index, iov_size, cmd->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;
>      return 0;
> @@ -1924,8 +1924,8 @@ static int megasas_handle_abort(MegasasState *s, 
> MegasasCmd *cmd)
>          abort_ctx &= (uint64_t)0xFFFFFFFF;
>      }
>      if (abort_cmd->context != abort_ctx) {
> -        trace_megasas_abort_invalid_context(cmd->index, abort_cmd->index,
> -                                            abort_cmd->context);
> +        trace_megasas_abort_invalid_context(cmd->index, abort_cmd->context,
> +                                            abort_cmd->index);
>          s->event_count++;
>          return MFI_STAT_ABORT_NOT_POSSIBLE;
>      }
> 
Reviewed-by: Hannes Reinecke <address@hidden>

Cheers,

Hannes
-- 
Dr. Hannes Reinecke                Teamlead Storage & Networking
address@hidden                                 +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)