util/vfio-helpers: Unify trace-events size format
PATCH 1/1 util/vfio-helpers: Unify trace-events size format
Some 'qemu_vfio_*' trace events sizes are displayed using decimal notation, other using hexadecimal notation:
qemu_vfio_ram_block_added s 0xaaaaf2448d90 host 0xffff5bc00000 size 0x4000000 qemu_vfio_dma_map s 0xaaaaf2448d90 host 0xffff5bc00000 size 67108864 temporary 0 iova (nil) qemu_vfio_find_mapping s 0xaaaaf2448d90 host 0xffff5bc00000 qemu_vfio_new_mapping s 0xaaaaf2448d90 host 0xffff5bc00000 size 67108864 index 4 iova 0x114000 qemu_vfio_do_mapping s 0xaaaaf2448d90 host 0xffff5bc00000 size 67108864 iova 0x114000
As it is hard to follow, unify using hexadecimal for all sizes:
qemu_vfio_ram_block_added s 0xaaaaf1c60d90 host 0xffff2bc00000 size 0x4000000 qemu_vfio_dma_map s 0xaaaaf1c60d90 host 0xffff2bc00000 size 0x4000000 temporary 0 iova (nil) qemu_vfio_find_mapping s 0xaaaaf1c60d90 host 0xffff2bc00000 qemu_vfio_new_mapping s 0xaaaaf1c60d90 host 0xffff2bc00000 size 0x4000000 index 4 iova 0x114000 qemu_vfio_do_mapping s 0xaaaaf1c60d90 host 0xffff2bc00000 size 0x4000000 iova 0x114000
--- util/trace-events | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
util/trace-events +3 -3
@@ -79,7 +79,7 @@ qemu_vfio_dma_reset_temporary(void *s) "s %p" qemu_vfio_ram_block_added(void *s, void *p, size_t size) "s %p host %p size 0x%zx" qemu_vfio_ram_block_removed(void *s, void *p, size_t size) "s %p host %p size 0x%zx" qemu_vfio_find_mapping(void *s, void *p) "s %p host %p" -qemu_vfio_new_mapping(void *s, void *host, size_t size, int index, uint64_t iova) "s %p host %p size %zu index %d iova 0x%"PRIx64 -qemu_vfio_do_mapping(void *s, void *host, size_t size, uint64_t iova) "s %p host %p size %zu iova 0x%"PRIx64 -qemu_vfio_dma_map(void *s, void *host, size_t size, bool temporary, uint64_t *iova) "s %p host %p size %zu temporary %d iova %p" +qemu_vfio_new_mapping(void *s, void *host, size_t size, int index, uint64_t iova) "s %p host %p size 0x%zx index %d iova 0x%"PRIx64 +qemu_vfio_do_mapping(void *s, void *host, size_t size, uint64_t iova) "s %p host %p size 0x%zx iova 0x%"PRIx64 +qemu_vfio_dma_map(void *s, void *host, size_t size, bool temporary, uint64_t *iova) "s %p host %p size 0x%zx temporary %d iova %p" qemu_vfio_dma_unmap(void *s, void *host) "s %p host %p"
Signature · 1 line
2.26.2
Quoted 17 lines · On Thu, 20 Aug 2020 19:10:06 +0200 Philippe Mathieu-Daudé <[email protected]>…
Some 'qemu_vfio_*' trace events sizes are displayed using decimal notation, other using hexadecimal notation:
qemu_vfio_ram_block_addeds0xaaaaf2448d90host0xffff5bc00000size0x4000000qemu_vfio_dma_maps0xaaaaf2448d90host0xffff5bc00000size 67108864 temporary 0 iova (nil)qemu_vfio_find_mappings0xaaaaf2448d90host0xffff5bc00000qemu_vfio_new_mappings0xaaaaf2448d90host0xffff5bc00000size 67108864 index 4 iova0x114000qemu_vfio_do_mappings0xaaaaf2448d90host0xffff5bc00000size 67108864 iova0x114000As it is hard to follow, unify using hexadecimal for all sizes:
qemu_vfio_ram_block_addeds0xaaaaf1c60d90host0xffff2bc00000size0x4000000qemu_vfio_dma_maps0xaaaaf1c60d90host0xffff2bc00000size0x4000000temporary 0 iova (nil)qemu_vfio_find_mappings0xaaaaf1c60d90host0xffff2bc00000qemu_vfio_new_mappings0xaaaaf1c60d90host0xffff2bc00000size0x4000000index 4 iova0x114000qemu_vfio_do_mappings0xaaaaf1c60d90host0xffff2bc00000size0x4000000iova0x114000
Quoted 4 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- util/trace-events | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Quoted 12 lines · Philippe Mathieu-Daudé <[email protected]> 于2020年8月21日周五 上午1:11写道:
Some 'qemu_vfio_*' trace events sizes are displayed using decimal notation, other using hexadecimal notation:
qemu_vfio_ram_block_addeds0xaaaaf2448d90host0xffff5bc00000size0x4000000qemu_vfio_dma_maps0xaaaaf2448d90host0xffff5bc00000size 67108864 temporary 0 iova (nil)qemu_vfio_find_mappings0xaaaaf2448d90host0xffff5bc00000qemu_vfio_new_mappings0xaaaaf2448d90host0xffff5bc00000size 67108864 index 4 iova0x114000qemu_vfio_do_mappings0xaaaaf2448d90host0xffff5bc00000size 67108864 iova0x114000As it is hard to follow, unify using hexadecimal for all sizes:
Quoted 7 lines
qemu_vfio_ram_block_addeds0xaaaaf1c60d90host0xffff2bc00000size0x4000000qemu_vfio_dma_maps0xaaaaf1c60d90host0xffff2bc00000size0x4000000temporary 0 iova (nil)qemu_vfio_find_mappings0xaaaaf1c60d90host0xffff2bc00000qemu_vfio_new_mappings0xaaaaf1c60d90host0xffff2bc00000size0x4000000index 4 iova0x114000qemu_vfio_do_mappings0xaaaaf1c60d90host0xffff2bc00000size0x4000000iova0x114000Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 23 lines
--- util/trace-events | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)util/trace-events +3
-4@@ -79,7 +79,7 @@ qemu_vfio_dma_reset_temporary(void *s) "s %p" qemu_vfio_ram_block_added(void *s, void *p, size_t size) "s %p host %p size 0x%zx" qemu_vfio_ram_block_removed(void *s, void *p, size_t size) "s %p host %p size 0x%zx" qemu_vfio_find_mapping(void *s, void *p) "s %p host %p" -qemu_vfio_new_mapping(void *s, void *host, size_t size, int index, uint64_t iova) "s %p host %p size %zu index %d iova 0x%"PRIx64 -qemu_vfio_do_mapping(void *s, void *host, size_t size, uint64_t iova) "s %p host %p size %zu iova 0x%"PRIx64 -qemu_vfio_dma_map(void *s, void *host, size_t size, bool temporary, uint64_t *iova) "s %p host %p size %zu temporary %d iova %p" +qemu_vfio_new_mapping(void *s, void *host, size_t size, int index, uint64_t iova) "s %p host %p size 0x%zx index %d iova 0x%"PRIx64 +qemu_vfio_do_mapping(void *s, void *host, size_t size, uint64_t iova) "s %p host %p size 0x%zx iova 0x%"PRIx64 +qemu_vfio_dma_map(void *s, void *host, size_t size, bool temporary, uint64_t *iova) "s %p host %p size 0x%zx temporary %d iova %p" qemu_vfio_dma_unmap(void *s, void *host) "s %p host %p" --2.26.2
Laurent Vivier
AppliedLe 20/08/2020 à 19:10, Philippe Mathieu-Daudé a écrit :
Quoted 28 lines
Some 'qemu_vfio_*' trace events sizes are displayed using decimal notation, other using hexadecimal notation:
qemu_vfio_ram_block_addeds0xaaaaf2448d90host0xffff5bc00000size0x4000000qemu_vfio_dma_maps0xaaaaf2448d90host0xffff5bc00000size 67108864 temporary 0 iova (nil)qemu_vfio_find_mappings0xaaaaf2448d90host0xffff5bc00000qemu_vfio_new_mappings0xaaaaf2448d90host0xffff5bc00000size 67108864 index 4 iova0x114000qemu_vfio_do_mappings0xaaaaf2448d90host0xffff5bc00000size 67108864 iova0x114000As it is hard to follow, unify using hexadecimal for all sizes:
qemu_vfio_ram_block_addeds0xaaaaf1c60d90host0xffff2bc00000size0x4000000qemu_vfio_dma_maps0xaaaaf1c60d90host0xffff2bc00000size0x4000000temporary 0 iova (nil)qemu_vfio_find_mappings0xaaaaf1c60d90host0xffff2bc00000qemu_vfio_new_mappings0xaaaaf1c60d90host0xffff2bc00000size0x4000000index 4 iova0x114000qemu_vfio_do_mappings0xaaaaf1c60d90host0xffff2bc00000size0x4000000iova0x114000Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- util/trace-events | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)util/trace-events +0
-0
util/trace-events qemu_vfio_dma_reset_temporary(void *s) "s %p" · line 85
Quoted 10 lines
util/trace-events +3
-3@@ -79,7 +79,7 @@ qemu_vfio_dma_reset_temporary(void *s) "s %p" qemu_vfio_ram_block_added(void *s, void *p, size_t size) "s %p host %p size 0x%zx" qemu_vfio_ram_block_removed(void *s, void *p, size_t size) "s %p host %p size 0x%zx" qemu_vfio_find_mapping(void *s, void *p) "s %p host %p" -qemu_vfio_new_mapping(void *s, void *host, size_t size, int index, uint64_t iova) "s %p host %p size %zu index %d iova 0x%"PRIx64 -qemu_vfio_do_mapping(void *s, void *host, size_t size, uint64_t iova) "s %p host %p size %zu iova 0x%"PRIx64 -qemu_vfio_dma_map(void *s, void *host, size_t size, bool temporary, uint64_t *iova) "s %p host %p size %zu temporary %d iova %p" +qemu_vfio_new_mapping(void *s, void *host, size_t size, int index, uint64_t iova) "s %p host %p size 0x%zx index %d iova 0x%"PRIx64 +qemu_vfio_do_mapping(void *s, void *host, size_t size, uint64_t iova) "s %p host %p size 0x%zx iova 0x%"PRIx64 +qemu_vfio_dma_map(void *s, void *host, size_t size, bool temporary, uint64_t *iova) "s %p host %p size 0x%zx temporary %d iova %p" qemu_vfio_dma_unmap(void *s, void *host) "s %p host %p"
Applied to my trivial-patches branch.
Thanks,
Laurent