userfaultfd: enhance decoding of struct uffdio_api.features

[strace] / block.c

diff --git a/block.c b/block.c
index b885839cfdfcd883ade79aafabba790024098d93..99b76dac73f59d0abb4402c2ccf96a7f255a14bd 100644 (file)
--- a/block.c
+++ b/block.c
@@ -66,8 +66,10 @@ typedef struct blk_user_trace_setup {
 
 #include MPERS_DEFS
 
+#include "print_fields.h"
+
 #ifndef BLKPG
-# define BLKPG      _IO(0x12,105)
+# define BLKPG      _IO(0x12, 105)
 #endif
 
 /*
@@ -80,40 +82,40 @@ typedef struct blk_user_trace_setup {
 # define BLKTRACESETUP _IOWR(0x12, 115, struct_blk_user_trace_setup)
 #endif
 #ifndef BLKTRACESTART
-# define BLKTRACESTART _IO(0x12,116)
+# define BLKTRACESTART _IO(0x12, 116)
 #endif
 #ifndef BLKTRACESTOP
-# define BLKTRACESTOP _IO(0x12,117)
+# define BLKTRACESTOP _IO(0x12, 117)
 #endif
 #ifndef BLKTRACETEARDOWN
-# define BLKTRACETEARDOWN _IO(0x12,118)
+# define BLKTRACETEARDOWN _IO(0x12, 118)
 #endif
 #ifndef BLKDISCARD
-# define BLKDISCARD _IO(0x12,119)
+# define BLKDISCARD _IO(0x12, 119)
 #endif
 #ifndef BLKIOMIN
-# define BLKIOMIN _IO(0x12,120)
+# define BLKIOMIN _IO(0x12, 120)
 #endif
 #ifndef BLKIOOPT
-# define BLKIOOPT _IO(0x12,121)
+# define BLKIOOPT _IO(0x12, 121)
 #endif
 #ifndef BLKALIGNOFF
-# define BLKALIGNOFF _IO(0x12,122)
+# define BLKALIGNOFF _IO(0x12, 122)
 #endif
 #ifndef BLKPBSZGET
-# define BLKPBSZGET _IO(0x12,123)
+# define BLKPBSZGET _IO(0x12, 123)
 #endif
 #ifndef BLKDISCARDZEROES
-# define BLKDISCARDZEROES _IO(0x12,124)
+# define BLKDISCARDZEROES _IO(0x12, 124)
 #endif
 #ifndef BLKSECDISCARD
-# define BLKSECDISCARD _IO(0x12,125)
+# define BLKSECDISCARD _IO(0x12, 125)
 #endif
 #ifndef BLKROTATIONAL
-# define BLKROTATIONAL _IO(0x12,126)
+# define BLKROTATIONAL _IO(0x12, 126)
 #endif
 #ifndef BLKZEROOUT
-# define BLKZEROOUT _IO(0x12,127)
+# define BLKZEROOUT _IO(0x12, 127)
 #endif
 
 #include "xlat/blkpg_ops.h"
@@ -123,34 +125,30 @@ print_blkpg_req(struct tcb *tcp, const struct_blkpg_ioctl_arg *blkpg)
 {
        struct_blkpg_partition p;
 
-       tprints("{");
-       printxval(blkpg_ops, blkpg->op, "BLKPG_???");
-
-       tprintf(", flags=%d, datalen=%d, data=",
-               blkpg->flags, blkpg->datalen);
+       PRINT_FIELD_XVAL("{", *blkpg, op, blkpg_ops, "BLKPG_???");
+       PRINT_FIELD_D(", ", *blkpg, flags);
+       PRINT_FIELD_D(", ", *blkpg, datalen);
 
+       tprints(", data=");
        if (!umove_or_printaddr(tcp, ptr_to_kulong(blkpg->data), &p)) {
-               tprintf("{start=%" PRId64 ", length=%" PRId64
-                       ", pno=%d, devname=",
-                       p.start, p.length, p.pno);
-               print_quoted_string(p.devname, sizeof(p.devname),
-                                   QUOTE_0_TERMINATED);
-               tprints(", volname=");
-               print_quoted_string(p.volname, sizeof(p.volname),
-                                   QUOTE_0_TERMINATED);
+               PRINT_FIELD_D("{", p, start);
+               PRINT_FIELD_D(", ", p, length);
+               PRINT_FIELD_D(", ", p, pno);
+               PRINT_FIELD_CSTRING(", ", p, devname);
+               PRINT_FIELD_CSTRING(", ", p, volname);
                tprints("}");
        }
        tprints("}");
 }
 
 MPERS_PRINTER_DECL(int, block_ioctl, struct tcb *const tcp,
-                  const unsigned int code, const kernel_ureg_t arg)
+                  const unsigned int code, const kernel_ulong_t arg)
 {
        switch (code) {
        /* take arg as a value, not as a pointer */
        case BLKRASET:
        case BLKFRASET:
-               tprintf(", %lu", arg);
+               tprintf(", %" PRI_klu, arg);
                break;
 
        /* return an unsigned short */
@@ -240,21 +238,18 @@ MPERS_PRINTER_DECL(int, block_ioctl, struct tcb *const tcp,
                        tprints(", ");
                        if (umove_or_printaddr(tcp, arg, &buts))
                                break;
-                       tprintf("{act_mask=%u, buf_size=%u, "
-                               "buf_nr=%u, start_lba=%" PRIu64 ", "
-                               "end_lba=%" PRIu64 ", pid=%u",
-                               (unsigned)buts.act_mask, buts.buf_size,
-                               buts.buf_nr, buts.start_lba,
-                               buts.end_lba, buts.pid);
+                       PRINT_FIELD_U("{", buts, act_mask);
+                       PRINT_FIELD_U(", ", buts, buf_size);
+                       PRINT_FIELD_U(", ", buts, buf_nr);
+                       PRINT_FIELD_U(", ", buts, start_lba);
+                       PRINT_FIELD_U(", ", buts, end_lba);
+                       PRINT_FIELD_U(", ", buts, pid);
                        return 1;
                } else {
                        struct_blk_user_trace_setup buts;
 
-                       if (!syserror(tcp) && !umove(tcp, arg, &buts)) {
-                               tprints(", name=");
-                               print_quoted_string(buts.name, sizeof(buts.name),
-                                                   QUOTE_0_TERMINATED);
-                       }
+                       if (!syserror(tcp) && !umove(tcp, arg, &buts))
+                               PRINT_FIELD_CSTRING(", ", buts, name);
                        tprints("}");
                        break;
                }