diff options
| author | Dmitry V. Levin <ldv@strace.io> | 2021-01-29 22:26:23 +0300 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2021-01-29 08:00:00 +0000 |
| commit | d127de30209928ba625d8f24e566c73cea7aaa07 (patch) | |
| tree | 7fc3d1c8d622a6ab34de4c8c0a54bd68def8aad6 /kvm.c | |
| parent | 12d7fc37b1576e76e2bf61d7dba2a252e2471c30 (diff) | |
| download | strace-d127de30209928ba625d8f24e566c73cea7aaa07.tar.gz | |
print_fields.h: remove prefix argument from all remaining PRINT_FIELD_* macros
* print_fields.h (PRINT_FIELD_UID, PRINT_FIELD_LEN): Remove.
(PRINT_FIELD_D, PRINT_FIELD_U, PRINT_FIELD_ID, PRINT_FIELD_TGID):
Remove the first argument, all callers updated.
* net.c (MAYBE_PRINT_FIELD_LEN): New macro, use it instead of
PRINT_FIELD_LEN.
* tests/nlattr_smc_diag_msg.c (PRINT_FIELD_SMC_DIAG_CURSOR):
Remove the first argument, all callers updated.
Diffstat (limited to 'kvm.c')
| -rw-r--r-- | kvm.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -197,12 +197,14 @@ kvm_ioctl_set_user_memory_region(struct tcb *const tcp, const kernel_ulong_t arg if (umove_or_printaddr(tcp, arg, &u_memory_region)) return RVAL_IOCTL_DECODED; - PRINT_FIELD_U("{", u_memory_region, slot); + tprint_struct_begin(); + PRINT_FIELD_U(u_memory_region, slot); tprint_struct_next(); PRINT_FIELD_FLAGS(u_memory_region, flags, kvm_mem_flags, "KVM_MEM_???"); tprint_struct_next(); PRINT_FIELD_X(u_memory_region, guest_phys_addr); - PRINT_FIELD_U(", ", u_memory_region, memory_size); + tprint_struct_next(); + PRINT_FIELD_U(u_memory_region, memory_size); tprint_struct_next(); PRINT_FIELD_X(u_memory_region, userspace_addr); tprints("}"); @@ -270,7 +272,8 @@ kvm_ioctl_decode_cpuid2(struct tcb *const tcp, const unsigned int code, tprints(", "); if (!umove_or_printaddr(tcp, arg, &cpuid)) { - PRINT_FIELD_U("{", cpuid, nent); + tprint_struct_begin(); + PRINT_FIELD_U(cpuid, nent); tprints(", entries="); if (abbrev(tcp)) { |