Re: [PATCH for-8.2] s390x: Convert DPRINTF to trace events

[Thomas Huth <thuth@redhat.com>]

On 04/08/2023 10.04, Cédric Le Goater wrote:
> Output message are slightly modified to ease selection with wildcards
> and to report extra parameters.
> 
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
...
> diff --git a/hw/s390x/trace-events b/hw/s390x/trace-events
> index 8b9213eab90c31d1eb37816d350bf76e902ccd10..34da5ea3230a0ac82f72a4d7a2aee047194be493 100644
> --- a/hw/s390x/trace-events
> +++ b/hw/s390x/trace-events
> @@ -19,3 +19,20 @@ virtio_ccw_set_ind(uint64_t ind_loc, uint8_t ind_old, uint8_t ind_new) "VIRTIO-C
>   s390_pci_clp_cap(const char *id, uint32_t cap) "PCI: %s: missing expected CLP capability %u"
>   s390_pci_clp_cap_size(const char *id, uint32_t size, uint32_t cap) "PCI: %s: bad size (%u) for CLP capability %u"
>   s390_pci_clp_dev_info(const char *id) "PCI: %s: cannot read vfio device info"
> +
> +# s390-pci-bus.c
> +s390_pci_sclp_nodev(const char *str, uint32_t aid) "%s no dev found aid 0x%x"
> +s390_pci_iommu_xlate(uint64_t addr) "iommu trans addr 0x%" PRIx64
> +s390_pci_msi_ctrl_write(uint64_t data, uint32_t idx, uint32_t vec) "write_msix data 0x%" PRIx64 " idx %d vec 0x%x"
> +s390_pcihost(const char *msg) "%s"
> +
> +# s390-pci-inst.c
> +s390_pci_irqs(const char *str, uint32_t id) "%s irqs for adapter id %d"
> +s390_pci_kvm_aif(const char *str) "Failed to %s interrupt forwarding"
> +

Remove the empty line here?

> +s390_pci_list_entry(uint32_t g_l2, uint32_t vid, uint32_t did, uint32_t fid, uint32_t fh) "g_l2 %d vendor id 0x%x device id 0x%x fid 0x%x fh 0x%x"
> +s390_pci_list(uint32_t rc) "failed rc 0x%x"
> +s390_pci_unknown(const char *msg, uint32_t cmd) "%s unknown command 0x%x"
> +s390_pci_bar(uint32_t bar, uint32_t addr, uint64_t size, uint32_t barsize) "bar %d addr 0x%x size 0x%" PRIx64 "barsize 0x%x"
> +s390_pci_nodev(const char *cmd, uint32_t fh) "%s no pci dev fh 0x%x"
> +s390_pci_invalid(const char *cmd, uint32_t fh) "%s invalid space fh 0x%x"
> diff --git a/target/s390x/kvm/trace-events b/target/s390x/kvm/trace-events
> index 5289f5f6750e763c2e84f4d1626f70901a93d0ff..818f1a37a1525707ed0f61179ff03acb23fdf22c 100644
> --- a/target/s390x/kvm/trace-events
> +++ b/target/s390x/kvm/trace-events
> @@ -5,3 +5,10 @@ kvm_enable_cmma(int rc) "CMMA: enabling with result code %d"
>   kvm_clear_cmma(int rc) "CMMA: clearing with result code %d"
>   kvm_failed_cpu_state_set(int cpu_index, uint8_t state, const char *msg) "Warning: Unable to set cpu %d state %" PRIu8 " to KVM: %s"
>   kvm_assign_subch_ioeventfd(int fd, uint32_t addr, bool assign, int datamatch) "fd: %d sch: @0x%x assign: %d vq: %d"
> +
> +kvm_sw_breakpoint(uint32_t n) "KVM: will use %d-byte sw breakpoints"
> +kvm_insn_unhandled_priv(uint32_t x) "KVM: unhandled PRIV: 0x%x"
> +kvm_insn_diag(uint32_t x) "KVM: unknown DIAG: 0x%x"
> +kvm_insn(uint32_t ipa, uint32_t ipb) "handle_instruction 0x%x 0x%x"
> +kvm_intercept(uint32_t icpt_code, uint64_t psw_addr) "intercept: 0x%x (at 0x%"PRIx64"lx)"
> +kvm_msi_route_fixup(const char* msg) "%s"

Apart from the nit with the empty line:
Reviewed-by: Thomas Huth <thuth@redhat.com>