[Qemu-commits] [qemu/qemu] 67adf4: trace: Fix backwards mirror_yield parameters

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 67adf4b39806df42b4c96377b37004de0df3a1fd
      
https://github.com/qemu/qemu/commit/67adf4b39806df42b4c96377b37004de0df3a1fd
  Author: Eric Blake <address@hidden>
  Date:   2017-03-24 (Fri, 24 Mar 2017)

  Changed paths:
    M block/mirror.c

  Log Message:
  -----------
  trace: Fix backwards mirror_yield parameters

block/trace-events lists the parameters for mirror_yield
consistently with other mirror events (cnt just after s, like in
mirror_before_sleep; in_flight last, like in mirror_yield_in_flight).
But the callers were passing parameters in the wrong order, leading
to poor trace messages, including type truncation when there are
more than 4G dirty sectors involved.  Broken since its introduction
in commit bd48bde.

While touching this, ensure that all callers use the same type
(uint64_t) for cnt, as a later patch will enable the compiler to do
stricter type-checking.

Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d17e744848cac9a96c827be1f244ef9266710d8f
      
https://github.com/qemu/qemu/commit/d17e744848cac9a96c827be1f244ef9266710d8f
  Author: Eric Blake <address@hidden>
  Date:   2017-03-24 (Fri, 24 Mar 2017)

  Changed paths:
    M hw/scsi/megasas.c

  Log Message:
  -----------
  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 <address@hidden>
Reviewed-by: Hannes Reinecke <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 0d3ef78829332f2fdc323d1b625b60fe9c89119c
      
https://github.com/qemu/qemu/commit/0d3ef78829332f2fdc323d1b625b60fe9c89119c
  Author: Eric Blake <address@hidden>
  Date:   2017-03-24 (Fri, 24 Mar 2017)

  Changed paths:
    M hw/i386/amd_iommu.c
    M hw/i386/trace-events

  Log Message:
  -----------
  trace: Avoid abuse of amdvi_mmio_read

hw/i386/trace-events has an amdvi_mmio_read trace that is used for
both normal reads (listing the register name, address, size, and
offset) and for an error case (abusing the register name to show
an error message, the address to show the maximum value supported,
then shoehorning address and size into the size and offset
parameters).  The change from a wide address to a narrower size
parameter could truncate a (rather-large) bogus read attempt, so
it's better to create a separate dedicated trace with correct types,
rather than abusing the trace mechanism.  Broken since its
introduction in commit d29a09c.

[Change trace event argument type from hwaddr to uint64_t since
user-defined types should not be used for trace events.  This fixes a
build failure with LTTng UST.
--Stefan]

Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: ea2afcf5b6727a577cf561fd8fe0d8c397ecc927
      
https://github.com/qemu/qemu/commit/ea2afcf5b6727a577cf561fd8fe0d8c397ecc927
  Author: Peter Maydell <address@hidden>
  Date:   2017-03-24 (Fri, 24 Mar 2017)

  Changed paths:
    M block/mirror.c
    M hw/i386/amd_iommu.c
    M hw/i386/trace-events
    M hw/scsi/megasas.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' 
into staging

# gpg: Signature made Fri 24 Mar 2017 14:08:41 GMT
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: Avoid abuse of amdvi_mmio_read
  trace: Fix incorrect megasas trace parameters
  trace: Fix backwards mirror_yield parameters

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/7150d34a1d60...ea2afcf5b672