Skip to contentSkip to conversation

target/i386: tracing: format length values as hex

PATCH Applied Dov Murik 3 participants 5 messages Nov 3, 2020 – Dec 13, 2020

lore
Share & tools
lore

Dov Murik

author
#0 lore raw

PATCH 1/1 target/i386: tracing: format length values as hex

Three trace events had a literal "0x" prefix but the 'len' values were formatted in decimal base. Keep the prefix and format the numbers as hex, as is usually the case for length of memory regions.

---
 target/i386/trace-events | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
target/i386/trace-events +3 -3
index 789c700d4a..65c9b0fdda 100644
@@ -8,10 +8,10 @@ kvm_x86_update_msi_routes(int num) "Updated %d MSI routes"
 
 # sev.c
 kvm_sev_init(void) ""
-kvm_memcrypt_register_region(void *addr, size_t len) "addr %p len 0x%zu"
-kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%zu"
+kvm_memcrypt_register_region(void *addr, size_t len) "addr %p len 0x%zx"
+kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%zx"
 kvm_sev_change_state(const char *old, const char *new) "%s -> %s"
 kvm_sev_launch_start(int policy, void *session, void *pdh) "policy 0x%x session %p pdh %p"
-kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIu64
+kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIx64
 kvm_sev_launch_measurement(const char *value) "data %s"
 kvm_sev_launch_finish(void) ""
Signature · 1 line
2.20.1
author
#2 lore raw
In reply to Dov Murik

ping

Adding CC qemu-trivial.

This already got one R-b:
https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg00525.html

-Dov

Quoted 28 lines · Dov Murik

Three trace events had a literal "0x" prefix but the 'len' values were formatted in decimal base. Keep the prefix and format the numbers as hex, as is usually the case for length of memory regions.

---
  target/i386/trace-events | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
target/i386/trace-events +3 -3
index 789c700d4a..65c9b0fdda 100644
@@ -8,10 +8,10 @@ kvm_x86_update_msi_routes(int num) "Updated %d MSI routes"
 
  # sev.c
  kvm_sev_init(void) ""
-kvm_memcrypt_register_region(void *addr, size_t len) "addr %p len 0x%zu"
-kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%zu"
+kvm_memcrypt_register_region(void *addr, size_t len) "addr %p len 0x%zx"
+kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%zx"
  kvm_sev_change_state(const char *old, const char *new) "%s -> %s"
  kvm_sev_launch_start(int policy, void *session, void *pdh) "policy 0x%x session %p pdh %p"
-kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIu64
+kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIx64
  kvm_sev_launch_measurement(const char *value) "data %s"
  kvm_sev_launch_finish(void) ""
#3 lore raw

Le 09/12/2020 à 18:58, Dov Murik a écrit :

Quoted 26 lines

ping

Adding CC qemu-trivial.

This already got one R-b:
https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg00525.html

-Dov

Quoted 15 lines · Dov Murik

Three trace events had a literal "0x" prefix but the 'len' values were formatted in decimal base.  Keep the prefix and format the numbers as hex, as is usually the case for length of memory regions.

---
  target/i386/trace-events | 6 +++---

  1 file changed, 3 insertions(+), 3 deletions(-)
target/i386/trace-events +0 -0
index 789c700d4a..65c9b0fdda 100644
@@ -8,10 +8,10 @@ kvm_x86_update_msi_routes(int num) "Updated %d MSI routes"
 
Quoted 14 lines
Quoted 10 lines
target/i386/trace-events +0 -0
   # sev.c

  kvm_sev_init(void) ""

target/i386/trace-events +2 -2
-kvm_memcrypt_register_region(void *addr, size_t len) "addr %p len 0x%zu"
-kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%zu"
+kvm_memcrypt_register_region(void *addr, size_t len) "addr %p len 0x%zx"
+kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%zx"

  kvm_sev_change_state(const char *old, const char *new) "%s -> %s" kvm_sev_launch_start(int policy, void *session, void *pdh) "policy 0x%x session %p pdh %p"

target/i386/trace-events +1 -1
-kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIu64
+kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIx64
Quoted 3 lines

  kvm_sev_launch_measurement(const char *value) "data %s" kvm_sev_launch_finish(void) ""

Applied to my linux-user-for-6.0 branch.

Thanks,
Laurent

#4 lore raw

Le 13/12/2020 à 16:27, Laurent Vivier a écrit :

Quoted 42 lines

Le 09/12/2020 à 18:58, Dov Murik a écrit :

Quoted 26 lines

ping

Adding CC qemu-trivial.

This already got one R-b:
https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg00525.html

-Dov

Quoted 15 lines · Dov Murik

Three trace events had a literal "0x" prefix but the 'len' values were formatted in decimal base.  Keep the prefix and format the numbers as hex, as is usually the case for length of memory regions.

---
  target/i386/trace-events | 6 +++---

  1 file changed, 3 insertions(+), 3 deletions(-)
target/i386/trace-events +0 -0
index 789c700d4a..65c9b0fdda 100644
@@ -8,10 +8,10 @@ kvm_x86_update_msi_routes(int num) "Updated %d MSI routes"
 
Quoted 14 lines
Quoted 10 lines
target/i386/trace-events +0 -0
   # sev.c

  kvm_sev_init(void) ""

target/i386/trace-events +2 -2
-kvm_memcrypt_register_region(void *addr, size_t len) "addr %p len 0x%zu"
-kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%zu"
+kvm_memcrypt_register_region(void *addr, size_t len) "addr %p len 0x%zx"
+kvm_memcrypt_unregister_region(void *addr, size_t len) "addr %p len 0x%zx"

  kvm_sev_change_state(const char *old, const char *new) "%s -> %s" kvm_sev_launch_start(int policy, void *session, void *pdh) "policy 0x%x session %p pdh %p"

target/i386/trace-events +1 -1
-kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIu64
+kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIx64
Quoted 3 lines

  kvm_sev_launch_measurement(const char *value) "data %s" kvm_sev_launch_finish(void) ""

Quoted 1 line

Applied to my linux-user-for-6.0 branch.

s/linux-user-for-6.0/trivial-patches/