kvm: use print_fields.h helpers

* src/kvm.c (kvm_ioctl_create_vcpu, kvm_ioctl_set_user_memory_region,
kvm_ioctl_decode_regs, kvm_ioctl_decode_cpuid2, kvm_ioctl_decode_sregs,
kvm_ioctl_decode_check_extension): Use tprint_arg_next,
tprint_array_begin, tprint_array_end, and PRINT_VAL_U.

1 files changed, 9 insertions, 8 deletions

diff --git a/src/kvm.c b/src/kvm.c
index 65255cdd3..dd694604a 100644
--- a/src/kvm.c
+++ b/src/kvm.c
@@ -175,7 +175,8 @@ kvm_ioctl_create_vcpu(struct tcb *const tcp, const kernel_ulong_t arg)
 	uint32_t cpuid = arg;
 
 	if (entering(tcp)) {
-		tprintf(", %u", cpuid);
+		tprint_arg_next();
+		PRINT_VAL_U(cpuid);
 		if (dump_kvm_run_structure)
 			return 0;
 	} else if (!syserror(tcp)) {
@@ -192,7 +193,7 @@ kvm_ioctl_set_user_memory_region(struct tcb *const tcp, const kernel_ulong_t arg
 {
 	struct kvm_userspace_memory_region u_memory_region;
 
-	tprints(", ");
+	tprint_arg_next();
 	if (umove_or_printaddr(tcp, arg, &u_memory_region))
 		return RVAL_IOCTL_DECODED;
 
@@ -222,7 +223,7 @@ kvm_ioctl_decode_regs(struct tcb *const tcp, const unsigned int code,
 	if (code == KVM_GET_REGS && entering(tcp))
 		return 0;
 
-	tprints(", ");
+	tprint_arg_next();
 	if (!umove_or_printaddr(tcp, arg, &regs))
 		arch_print_kvm_regs(tcp, arg, &regs);
 
@@ -269,7 +270,7 @@ kvm_ioctl_decode_cpuid2(struct tcb *const tcp, const unsigned int code,
 			     ))
 		return 0;
 
-	tprints(", ");
+	tprint_arg_next();
 	if (!umove_or_printaddr(tcp, arg, &cpuid)) {
 		tprint_struct_begin();
 		PRINT_FIELD_U(cpuid, nent);
@@ -277,10 +278,10 @@ kvm_ioctl_decode_cpuid2(struct tcb *const tcp, const unsigned int code,
 		tprint_struct_next();
 		tprints_field_name("entries");
 		if (abbrev(tcp)) {
-			tprints("[");
+			tprint_array_begin();
 			if (cpuid.nent)
 				tprint_more_data_follows();
-			tprints("]");
+			tprint_array_end();
 
 		} else {
 			struct kvm_cpuid_entry2 entry;
@@ -305,7 +306,7 @@ kvm_ioctl_decode_sregs(struct tcb *const tcp, const unsigned int code,
 	if (code == KVM_GET_SREGS && entering(tcp))
 		return 0;
 
-	tprints(", ");
+	tprint_arg_next();
 	if (!umove_or_printaddr(tcp, arg, &sregs))
 		arch_print_kvm_sregs(tcp, arg, &sregs);
 
@@ -318,7 +319,7 @@ static int
 kvm_ioctl_decode_check_extension(struct tcb *const tcp, const unsigned int code,
 				 const kernel_ulong_t arg)
 {
-	tprints(", ");
+	tprint_arg_next();
 	printxval64(kvm_cap, arg, "KVM_CAP_???");
 	return RVAL_IOCTL_DECODED;
 }