sg_io: print names of array fields and corresponding length fields

* sg_io_v3.c (decode_request): Print names of cmd_len, cmdp,
and dxferp fields.
(decode_response): Print names of dxferp, sb_len_wr, and sbp fields.
* sg_io_v4.c (decode_request): Print names of request_len, request,
dout_xfer_len, and dout_xferp fields.
(decode_response): Print names of response_len, response,
and din_xferp fields.

diff --git a/sg_io_v3.c b/sg_io_v3.c
index a0d8ac9df9b64c8016e193f80dc3d48ba96728da..a018bdba3ad3139c32313f5969382aaf616e122d 100644 (file)
--- a/sg_io_v3.c
+++ b/sg_io_v3.c
@@ -71,7 +71,7 @@ decode_request(struct tcb *const tcp, const kernel_ulong_t arg)
        tprints("dxfer_direction=");
        printxval(sg_io_dxfer_direction, sg_io.dxfer_direction,
                  "SG_DXFER_???");
-       tprintf(", cmd[%u]=", sg_io.cmd_len);
+       tprintf(", cmd_len=%u, cmdp=", sg_io.cmd_len);
        print_sg_io_buffer(tcp, ptr_to_kulong(sg_io.cmdp), sg_io.cmd_len);
        tprintf(", mx_sb_len=%d", sg_io.mx_sb_len);
        tprintf(", iovec_count=%d", sg_io.iovec_count);
@@ -82,7 +82,7 @@ decode_request(struct tcb *const tcp, const kernel_ulong_t arg)
 
        if (sg_io.dxfer_direction == SG_DXFER_TO_DEV ||
            sg_io.dxfer_direction == SG_DXFER_TO_FROM_DEV) {
-               tprintf(", data[%u]=", sg_io.dxfer_len);
+               tprints(", dxferp=");
                if (sg_io.iovec_count)
                        tprint_iov_upto(tcp, sg_io.iovec_count,
                                        ptr_to_kulong(sg_io.dxferp),
@@ -116,7 +116,7 @@ decode_response(struct tcb *const tcp, const kernel_ulong_t arg)
 
                if (sg_io.resid > 0)
                        din_len -= sg_io.resid;
-               tprintf(", data[%u]=", din_len);
+               tprints(", dxferp=");
                if (sg_io.iovec_count)
                        tprint_iov_upto(tcp, sg_io.iovec_count,
                                        ptr_to_kulong(sg_io.dxferp),
@@ -128,7 +128,7 @@ decode_response(struct tcb *const tcp, const kernel_ulong_t arg)
        }
        tprintf(", status=%#x", sg_io.status);
        tprintf(", masked_status=%#x", sg_io.masked_status);
-       tprintf(", sb[%u]=", sg_io.sb_len_wr);
+       tprintf(", sb_len_wr=%u, sbp=", sg_io.sb_len_wr);
        print_sg_io_buffer(tcp, ptr_to_kulong(sg_io.sbp), sg_io.sb_len_wr);
        tprintf(", host_status=%#x", sg_io.host_status);
        tprintf(", driver_status=%#x", sg_io.driver_status);

diff --git a/sg_io_v4.c b/sg_io_v4.c
index 094caae743da60cdcd1b468dafceae13f62bb457..789362bf7921c261bc9394c0dc31c206828218f2 100644 (file)
--- a/sg_io_v4.c
+++ b/sg_io_v4.c
@@ -59,7 +59,7 @@ decode_request(struct tcb *const tcp, const kernel_ulong_t arg)
        printxval(bsg_protocol, sg_io.protocol, "BSG_PROTOCOL_???");
        tprints(", subprotocol=");
        printxval(bsg_subprotocol, sg_io.subprotocol, "BSG_SUB_PROTOCOL_???");
-       tprintf(", request[%u]=", sg_io.request_len);
+       tprintf(", request_len=%u, request=", sg_io.request_len);
        print_sg_io_buffer(tcp, sg_io.request, sg_io.request_len);
        tprintf(", request_tag=%#" PRI__x64, sg_io.request_tag);
        tprintf(", request_attr=%u", sg_io.request_attr);
@@ -75,7 +75,7 @@ decode_request(struct tcb *const tcp, const kernel_ulong_t arg)
        tprints(", flags=");
        printflags(bsg_flags, sg_io.flags, "BSG_FLAG_???");
        tprintf(", usr_ptr=%#" PRI__x64, sg_io.usr_ptr);
-       tprintf(", dout[%u]=", sg_io.dout_xfer_len);
+       tprints(", dout_xferp=");
        if (sg_io.dout_iovec_count)
                tprint_iov_upto(tcp, sg_io.dout_iovec_count, sg_io.dout_xferp,
                                IOV_DECODE_STR, sg_io.dout_xfer_len);
@@ -100,12 +100,12 @@ decode_response(struct tcb *const tcp, const kernel_ulong_t arg)
                return RVAL_DECODED | 1;
        }
 
-       tprintf(", response[%u]=", sg_io.response_len);
+       tprintf(", response_len=%u, response=", sg_io.response_len);
        print_sg_io_buffer(tcp, sg_io.response, sg_io.response_len);
        din_len = sg_io.din_xfer_len;
        if (sg_io.din_resid > 0)
                din_len -= sg_io.din_resid;
-       tprintf(", din[%u]=", din_len);
+       tprints(", din_xferp=");
        if (sg_io.din_iovec_count)
                tprint_iov_upto(tcp, sg_io.din_iovec_count, sg_io.din_xferp,
                                syserror(tcp) ? IOV_DECODE_ADDR :