From 8908eb1a4aaf6b6573de3c44dfdaac6049061c02 Mon Sep 17 00:00:00 2001 From: Vladimir Sementsov-Ogievskiy Date: Mon, 31 Jul 2017 19:01:35 +0300 Subject: trace-events: fix code style: print 0x before hex numbers The only exception are groups of numers separated by symbols '.', ' ', ':', '/', like 'ab.09.7d'. This patch is made by the following: > find . -name trace-events | xargs python script.py where script.py is the following python script: ========================= #!/usr/bin/env python import sys import re import fileinput rhex = '%[-+ *.0-9]*(?:[hljztL]|ll|hh)?(?:x|X|"\s*PRI[xX][^"]*"?)' rgroup = re.compile('((?:' + rhex + '[.:/ ])+' + rhex + ')') rbad = re.compile('(?', arr[i]) sys.stdout.write(''.join(arr)) ========================= Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Stefan Hajnoczi Acked-by: Cornelia Huck Message-id: 20170731160135.12101-5-vsementsov@virtuozzo.com Signed-off-by: Stefan Hajnoczi --- hw/misc/trace-events | 78 ++++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'hw/misc') diff --git a/hw/misc/trace-events b/hw/misc/trace-events index 56ee4fb..3313585 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -1,54 +1,54 @@ # See docs/devel/tracing.txt for syntax documentation. # hw/misc/eccmemctl.c -ecc_mem_writel_mer(uint32_t val) "Write memory enable %08x" -ecc_mem_writel_mdr(uint32_t val) "Write memory delay %08x" -ecc_mem_writel_mfsr(uint32_t val) "Write memory fault status %08x" -ecc_mem_writel_vcr(uint32_t val) "Write slot configuration %08x" -ecc_mem_writel_dr(uint32_t val) "Write diagnostic %08x" -ecc_mem_writel_ecr0(uint32_t val) "Write event count 1 %08x" -ecc_mem_writel_ecr1(uint32_t val) "Write event count 2 %08x" -ecc_mem_readl_mer(uint32_t ret) "Read memory enable %08x" -ecc_mem_readl_mdr(uint32_t ret) "Read memory delay %08x" -ecc_mem_readl_mfsr(uint32_t ret) "Read memory fault status %08x" -ecc_mem_readl_vcr(uint32_t ret) "Read slot configuration %08x" -ecc_mem_readl_mfar0(uint32_t ret) "Read memory fault address 0 %08x" -ecc_mem_readl_mfar1(uint32_t ret) "Read memory fault address 1 %08x" -ecc_mem_readl_dr(uint32_t ret) "Read diagnostic %08x" -ecc_mem_readl_ecr0(uint32_t ret) "Read event count 1 %08x" -ecc_mem_readl_ecr1(uint32_t ret) "Read event count 2 %08x" -ecc_diag_mem_writeb(uint64_t addr, uint32_t val) "Write diagnostic %"PRId64" = %02x" -ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= %02x" +ecc_mem_writel_mer(uint32_t val) "Write memory enable 0x%08x" +ecc_mem_writel_mdr(uint32_t val) "Write memory delay 0x%08x" +ecc_mem_writel_mfsr(uint32_t val) "Write memory fault status 0x%08x" +ecc_mem_writel_vcr(uint32_t val) "Write slot configuration 0x%08x" +ecc_mem_writel_dr(uint32_t val) "Write diagnostic 0x%08x" +ecc_mem_writel_ecr0(uint32_t val) "Write event count 1 0x%08x" +ecc_mem_writel_ecr1(uint32_t val) "Write event count 2 0x%08x" +ecc_mem_readl_mer(uint32_t ret) "Read memory enable 0x%08x" +ecc_mem_readl_mdr(uint32_t ret) "Read memory delay 0x%08x" +ecc_mem_readl_mfsr(uint32_t ret) "Read memory fault status 0x%08x" +ecc_mem_readl_vcr(uint32_t ret) "Read slot configuration 0x%08x" +ecc_mem_readl_mfar0(uint32_t ret) "Read memory fault address 0 0x%08x" +ecc_mem_readl_mfar1(uint32_t ret) "Read memory fault address 1 0x%08x" +ecc_mem_readl_dr(uint32_t ret) "Read diagnostic 0x%08x" +ecc_mem_readl_ecr0(uint32_t ret) "Read event count 1 0x%08x" +ecc_mem_readl_ecr1(uint32_t ret) "Read event count 2 0x%08x" +ecc_diag_mem_writeb(uint64_t addr, uint32_t val) "Write diagnostic %"PRId64" = 0x%02x" +ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= 0x%02x" # hw/misc/slavio_misc.c slavio_misc_update_irq_raise(void) "Raise IRQ" slavio_misc_update_irq_lower(void) "Lower IRQ" slavio_set_power_fail(int power_failing, uint8_t config) "Power fail: %d, config: %d" -slavio_cfg_mem_writeb(uint32_t val) "Write config %02x" -slavio_cfg_mem_readb(uint32_t ret) "Read config %02x" -slavio_diag_mem_writeb(uint32_t val) "Write diag %02x" -slavio_diag_mem_readb(uint32_t ret) "Read diag %02x" -slavio_mdm_mem_writeb(uint32_t val) "Write modem control %02x" -slavio_mdm_mem_readb(uint32_t ret) "Read modem control %02x" -slavio_aux1_mem_writeb(uint32_t val) "Write aux1 %02x" -slavio_aux1_mem_readb(uint32_t ret) "Read aux1 %02x" -slavio_aux2_mem_writeb(uint32_t val) "Write aux2 %02x" -slavio_aux2_mem_readb(uint32_t ret) "Read aux2 %02x" -apc_mem_writeb(uint32_t val) "Write power management %02x" -apc_mem_readb(uint32_t ret) "Read power management %02x" -slavio_sysctrl_mem_writel(uint32_t val) "Write system control %08x" -slavio_sysctrl_mem_readl(uint32_t ret) "Read system control %08x" -slavio_led_mem_writew(uint32_t val) "Write diagnostic LED %04x" -slavio_led_mem_readw(uint32_t ret) "Read diagnostic LED %04x" +slavio_cfg_mem_writeb(uint32_t val) "Write config 0x%02x" +slavio_cfg_mem_readb(uint32_t ret) "Read config 0x%02x" +slavio_diag_mem_writeb(uint32_t val) "Write diag 0x%02x" +slavio_diag_mem_readb(uint32_t ret) "Read diag 0x%02x" +slavio_mdm_mem_writeb(uint32_t val) "Write modem control 0x%02x" +slavio_mdm_mem_readb(uint32_t ret) "Read modem control 0x%02x" +slavio_aux1_mem_writeb(uint32_t val) "Write aux1 0x%02x" +slavio_aux1_mem_readb(uint32_t ret) "Read aux1 0x%02x" +slavio_aux2_mem_writeb(uint32_t val) "Write aux2 0x%02x" +slavio_aux2_mem_readb(uint32_t ret) "Read aux2 0x%02x" +apc_mem_writeb(uint32_t val) "Write power management 0x%02x" +apc_mem_readb(uint32_t ret) "Read power management 0x%02x" +slavio_sysctrl_mem_writel(uint32_t val) "Write system control 0x%08x" +slavio_sysctrl_mem_readl(uint32_t ret) "Read system control 0x%08x" +slavio_led_mem_writew(uint32_t val) "Write diagnostic LED 0x%04x" +slavio_led_mem_readw(uint32_t ret) "Read diagnostic LED 0x%04x" # hw/misc/milkymist-hpdmc.c -milkymist_hpdmc_memory_read(uint32_t addr, uint32_t value) "addr=%08x value=%08x" -milkymist_hpdmc_memory_write(uint32_t addr, uint32_t value) "addr=%08x value=%08x" +milkymist_hpdmc_memory_read(uint32_t addr, uint32_t value) "addr=0x%08x value=0x%08x" +milkymist_hpdmc_memory_write(uint32_t addr, uint32_t value) "addr=0x%08x value=0x%08x" # hw/misc/milkymist-pfpu.c -milkymist_pfpu_memory_read(uint32_t addr, uint32_t value) "addr %08x value %08x" -milkymist_pfpu_memory_write(uint32_t addr, uint32_t value) "addr %08x value %08x" -milkymist_pfpu_vectout(uint32_t a, uint32_t b, uint32_t dma_ptr) "a %08x b %08x dma_ptr %08x" +milkymist_pfpu_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" +milkymist_pfpu_memory_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" +milkymist_pfpu_vectout(uint32_t a, uint32_t b, uint32_t dma_ptr) "a 0x%08x b 0x%08x dma_ptr 0x%08x" milkymist_pfpu_pulse_irq(void) "Pulse IRQ" # hw/misc/aspeed_scu.c -- cgit v1.1