s390x: Convert DPRINTF to trace events
PATCH 1/1 s390x: Convert DPRINTF to trace events
Output message are slightly modified to ease selection with wildcards and to report extra parameters.
--- hw/s390x/s390-pci-bus.c | 25 ++++++------------ hw/s390x/s390-pci-inst.c | 48 ++++++++++++++--------------------- target/s390x/kvm/kvm.c | 33 ++++++++---------------- hw/s390x/trace-events | 17 +++++++++++++ target/s390x/kvm/trace-events | 7 +++++ 5 files changed, 62 insertions(+), 68 deletions(-)
hw/s390x/s390-pci-bus.c +8 -17
@@ -27,16 +27,7 @@#include "sysemu/reset.h" #include "sysemu/runstate.h" -#ifndef DEBUG_S390PCI_BUS -#define DEBUG_S390PCI_BUS 0 -#endif - -#define DPRINTF (fmt, ...) \ - do { \ - if (DEBUG_S390PCI_BUS) { \ - fprintf(stderr, "S390pci-bus: " fmt, ## __VA_ARGS__); \ - } \ - } while (0) +#include "trace.h" S390pciState *s390_get_phb (void ) {
@@ -132,7 +123,7 @@ void s390_pci_sclp_configure(SCCB *sccb)uint16_t rc;if (!pbdev) { -DPRINTF ("sclp config no dev found\n" ); +trace_s390_pci_sclp_nodev ("configure" ,be32_to_cpu (psccb->aid)); rc =SCLP_RC_ADAPTER_ID_NOT_RECOGNIZED ; goto out; }
@@ -199,7 +190,7 @@ void s390_pci_sclp_deconfigure(SCCB *sccb)uint16_t rc;if (!pbdev) { -DPRINTF ("sclp deconfig no dev found\n" ); +trace_s390_pci_sclp_nodev ("deconfigure" ,be32_to_cpu (psccb->aid)); rc =SCLP_RC_ADAPTER_ID_NOT_RECOGNIZED ; goto out; }
@@ -573,7 +564,7 @@ static IOMMUTLBEntry s390_translate_iommu(IOMMUMemoryRegion *mr, hwaddr addr,return ret; } -DPRINTF ("iommu trans addr 0x%" PRIx64"\n" , addr); +trace_s390_pci_iommu_xlate (addr);if (addr < iommu->pba || addr > iommu->pal) { error =ERR_EVENT_OORANGE ;
@@ -692,8 +683,8 @@ static void s390_msi_ctrl_write(void *opaque, hwaddr addr, uint64_t data,uint32_t sum_bit;assert (pbdev); -DPRINTF ("write_msix data 0x%" PRIx64" idx %d vec 0x%x\n" , data, - pbdev->idx, vec); + +trace_s390_pci_msi_ctrl_write (data, pbdev->idx, vec);if (pbdev->state !=ZPCI_FS_ENABLED ) {return ;
@@ -843,7 +834,7 @@ static void s390_pcihost_realize(DeviceState *dev, Error **errp)PCIHostState *phb =PCI_HOST_BRIDGE (dev);S390pciState *s =S390_PCI_HOST_BRIDGE (dev); -DPRINTF ("host_init\n" ); +trace_s390_pcihost ("realize" ); b = pci_register_root_bus(dev, NULL, s390_pci_set_irq, s390_pci_map_irq, NULL, get_system_memory(), get_system_io(), 0,
@@ -1120,7 +1111,7 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,return ; } }else { -DPRINTF ("zPCI interpretation facilities missing.\n" ); +trace_s390_pcihost ("zPCI interpretation missing" ); pbdev->interp = false; pbdev->forwarding_assist = false; }
hw/s390x/s390-pci-inst.c +19 -29
162 lines not on this page · raw message
target/s390x/kvm/kvm.c +11 -22
@@ -52,16 +52,6 @@#include "hw/s390x/s390-virtio-hcall.h" #include "target/s390x/kvm/pv.h" -#ifndef DEBUG_KVM -#define DEBUG_KVM 0 -#endif - -#define DPRINTF (fmt, ...) do { \ - if (DEBUG_KVM) { \ - fprintf(stderr, fmt, ## __VA_ARGS__); \ - } \ -} while (0) -#define kvm_vm_check_mem_attr (s, attr) \ kvm_vm_check_attr(s, KVM_S390_VM_MEM_CTRL, attr)
@@ -914,11 +904,11 @@ static void determine_sw_breakpoint_instr(void)if (kvm_vm_enable_cap (kvm_state,KVM_CAP_S390_USER_INSTR0 ,0 )) { sw_bp_inst = diag_501; sw_bp_ilen =sizeof (diag_501); -DPRINTF ("KVM: will use 4-byte sw breakpoints.\n" ); +trace_kvm_sw_breakpoint (4 ); }else { sw_bp_inst = instr_0x0000; sw_bp_ilen =sizeof (instr_0x0000); -DPRINTF ("KVM: will use 2-byte sw breakpoints.\n" ); +trace_kvm_sw_breakpoint (2 ); } }
@@ -1309,7 +1299,7 @@ static int handle_b2(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)break ;default : rc =-1 ; -DPRINTF ("KVM: unhandled PRIV: 0xb2%x\n" , ipa1); +trace_kvm_insn_unhandled_priv (ipa1);break ; }
@@ -1499,7 +1489,7 @@ static int handle_b9(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)break ;default : r =-1 ; -DPRINTF ("KVM: unhandled PRIV: 0xb9%x\n" , ipa1); +trace_kvm_insn_unhandled_priv (ipa1);break ; }
@@ -1523,7 +1513,7 @@ static int handle_eb(S390CPU *cpu, struct kvm_run *run, uint8_t ipbl)break ;default : r =-1 ; -DPRINTF ("KVM: unhandled PRIV: 0xeb%x\n" , ipbl); +trace_kvm_insn_unhandled_priv (ipbl);break ; }
@@ -1543,7 +1533,7 @@ static int handle_e3(S390CPU *cpu, struct kvm_run *run, uint8_t ipbl)break ;default : r =-1 ; -DPRINTF ("KVM: unhandled PRIV: 0xe3%x\n" , ipbl); +trace_kvm_insn_unhandled_priv (ipbl);break ; }
@@ -1666,7 +1656,7 @@ static int handle_diag(S390CPU *cpu, struct kvm_run *run, uint32_t ipb) r =handle_sw_breakpoint (cpu, run);break ;default : -DPRINTF ("KVM: unknown DIAG: 0x%x\n" , func_code); +trace_kvm_insn_diag (func_code);kvm_s390_program_interrupt (cpu,PGM_SPECIFICATION );break ; }
@@ -1696,8 +1686,7 @@ static int handle_instruction(S390CPU *cpu, struct kvm_run *run)uint8_t ipa1 = run->s390_sieic.ipa &0x00ff ;int r =-1 ; -DPRINTF ("handle_instruction 0x%x 0x%x\n" , - run->s390_sieic.ipa, run->s390_sieic.ipb); +trace_kvm_insn (run->s390_sieic.ipa, run->s390_sieic.ipb);switch (ipa0) {case IPA0_B2 : r =handle_b2 (cpu, run, ipa1);
@@ -1777,7 +1766,7 @@ static int handle_intercept(S390CPU *cpu)int icpt_code = run->s390_sieic.icptcode;int r =0 ; -DPRINTF ("intercept: 0x%x (at 0x%lx)\n" , icpt_code, (long )run->psw_addr); +trace_kvm_intercept (icpt_code, (long )run->psw_addr);switch (icpt_code) {case ICPT_INSTRUCTION :case ICPT_PV_INSTR :
@@ -2165,13 +2154,13 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,uint32_t vec = data &ZPCI_MSI_VEC_MASK ;if (!dev) { -DPRINTF ("add_msi_route no pci device\n" ); +trace_kvm_msi_route_fixup ("no pci device" );return -ENODEV ; } pbdev =s390_pci_find_dev_by_target (s390_get_phb (),DEVICE (dev)->id);if (!pbdev) { -DPRINTF ("add_msi_route no zpci device\n" ); +trace_kvm_msi_route_fixup ("no zpci device" );return -ENODEV ; }
hw/s390x/trace-events +17 -0
@@ -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" + +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"
target/s390x/kvm/trace-events +7 -0
@@ -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"
Signature · 1 line
2.41.0
Quoted 5 lines · Cédric Le Goater
Output message are slightly modified to ease selection with wildcards and to report extra parameters.
Signed-off-by Cédric Le Goater <[email protected]>---
...
Quoted 9 lines
hw/s390x/trace-events +1
-0@@ -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" +
hw/s390x/trace-events virtio_ccw_set_ind(uint64_t ind_loc, uint8_t ind_old, uint8_t ind_new) "VIRTIO-C · line 32
Quoted 10 lines
hw/s390x/trace-events +10
-0+# 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?
Quoted 11 lines
hw/s390x/trace-events +6
-0+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"target/s390x/kvm/trace-events +0
-0
target/s390x/kvm/trace-events kvm_enable_cmma(int rc) "CMMA: enabling with result code %d" · line 14
Quoted 10 lines
target/s390x/kvm/trace-events +7
-0@@ -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:
Quoted 11 lines · Cédric Le Goater
Output message are slightly modified to ease selection with wildcards and to report extra parameters.
Signed-off-by Cédric Le Goater <[email protected]>--- hw/s390x/s390-pci-bus.c | 25 ++++++------------ hw/s390x/s390-pci-inst.c | 48 ++++++++++++++--------------------- target/s390x/kvm/kvm.c | 33 ++++++++---------------- hw/s390x/trace-events | 17 +++++++++++++ target/s390x/kvm/trace-events | 7 +++++ 5 files changed, 62 insertions(+), 68 deletions(-)
Thanks for this, it has been on my todo list for a while. Message contents look fine, so with Thomas's minor nit: