]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/dev/dtrace/sdt_subr.c
projects / apple / xnu.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
xnu-7195.101.1.tar.gz
[apple/xnu.git] / bsd / dev / dtrace / sdt_subr.c
diff --git a/bsd/dev/dtrace/sdt_subr.c b/bsd/dev/dtrace/sdt_subr.c
index 18c16e074b927e8cf90a9e1acd78a24d2b1d52b4..67f056dab075a33a7be78bea1bb7b30cdbab9845 100644 (file)
--- a/bsd/dev/dtrace/sdt_subr.c
+++ b/bsd/dev/dtrace/sdt_subr.c
@@ -23,56 +23,62 @@
  * Use is subject to license terms.
  */
 
  * Use is subject to license terms.
  */
 
-/* #pragma ident       "@(#)sdt_subr.c 1.13    08/06/13 SMI" */
-
 #include <sys/sdt_impl.h>
 
 static dtrace_pattr_t vtrace_attr = {
 #include <sys/sdt_impl.h>
 
 static dtrace_pattr_t vtrace_attr = {
-{ DTRACE_STABILITY_UNSTABLE, DTRACE_STABILITY_UNSTABLE, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_UNSTABLE, DTRACE_STABILITY_UNSTABLE, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_UNSTABLE, DTRACE_STABILITY_UNSTABLE, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_UNSTABLE, DTRACE_STABILITY_UNSTABLE, DTRACE_CLASS_ISA },
 };
 
 static dtrace_pattr_t info_attr = {
 };
 
 static dtrace_pattr_t info_attr = {
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
 };
 
 static dtrace_pattr_t fpu_attr = {
 };
 
 static dtrace_pattr_t fpu_attr = {
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_CPU },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_CPU },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
 };
 
 static dtrace_pattr_t fsinfo_attr = {
 };
 
 static dtrace_pattr_t fsinfo_attr = {
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
 };
 
 static dtrace_pattr_t stab_attr = {
 };
 
 static dtrace_pattr_t stab_attr = {
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
 };
 
 static dtrace_pattr_t sdt_attr = {
 };
 
 static dtrace_pattr_t sdt_attr = {
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
+};
+
+static dtrace_pattr_t hv_attr = {
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+       { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
 };
 
 sdt_provider_t sdt_providers[] = {
 };
 
 sdt_provider_t sdt_providers[] = {
@@ -93,6 +99,11 @@ sdt_provider_t sdt_providers[] = {
        { "sysevent", "__sysevent____", &stab_attr, 0 },
        { "sdt", "__sdt____", &sdt_attr, 0 },
        { "boost", "__boost____", &stab_attr, 0},
        { "sysevent", "__sysevent____", &stab_attr, 0 },
        { "sdt", "__sdt____", &sdt_attr, 0 },
        { "boost", "__boost____", &stab_attr, 0},
+       { "route", "__route____", &stab_attr, 0 },
+#if KASAN
+       { "kasan", "__kasan____", &stab_attr, 0 },
+#endif
+       { "hv", "__hv____", &hv_attr, 0 },
        { NULL, NULL, NULL, 0 }
 };
 
        { NULL, NULL, NULL, 0 }
 };
 
@@ -136,6 +147,7 @@ sdt_argdesc_t sdt_args[] = {
        { "proc", "exec-failure", 0, 0, "int", NULL },
        /* proc:::exec-success has no arguments */
        { "proc", "exit", 0, 0, "int", NULL },
        { "proc", "exec-failure", 0, 0, "int", NULL },
        /* proc:::exec-success has no arguments */
        { "proc", "exit", 0, 0, "int", NULL },
+       { "proc", "exited", 0, 0, "struct proc *", "psinfo_t *"},
        { "proc", "fault", 0, 0, "int", NULL },
        { "proc", "fault", 1, 1, "siginfo_t *", NULL },
        { "proc", "lwp-create", 0, 0, "struct thread *", "lwpsinfo_t *" },
        { "proc", "fault", 0, 0, "int", NULL },
        { "proc", "fault", 1, 1, "siginfo_t *", NULL },
        { "proc", "lwp-create", 0, 0, "struct thread *", "lwpsinfo_t *" },
@@ -187,622 +199,622 @@ sdt_argdesc_t sdt_args[] = {
        { "fsinfo", NULL, 1, 1, "int", NULL },
 
        { "nfsv3", "op-getattr-start", 0, 0, "struct svc_req *",
        { "fsinfo", NULL, 1, 1, "int", NULL },
 
        { "nfsv3", "op-getattr-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-getattr-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-getattr-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-getattr-start", 2, 3, "GETATTR3args *", NULL },
        { "nfsv3", "op-getattr-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-getattr-start", 2, 3, "GETATTR3args *", NULL },
        { "nfsv3", "op-getattr-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-getattr-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-getattr-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-getattr-done", 2, 3, "GETATTR3res *", NULL },
        { "nfsv3", "op-setattr-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-getattr-done", 2, 3, "GETATTR3res *", NULL },
        { "nfsv3", "op-setattr-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-setattr-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-setattr-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-setattr-start", 2, 3, "SETATTR3args *", NULL },
        { "nfsv3", "op-setattr-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-setattr-start", 2, 3, "SETATTR3args *", NULL },
        { "nfsv3", "op-setattr-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-setattr-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-setattr-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-setattr-done", 2, 3, "SETATTR3res *", NULL },
        { "nfsv3", "op-lookup-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-setattr-done", 2, 3, "SETATTR3res *", NULL },
        { "nfsv3", "op-lookup-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-lookup-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-lookup-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-lookup-start", 2, 3, "LOOKUP3args *", NULL },
        { "nfsv3", "op-lookup-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-lookup-start", 2, 3, "LOOKUP3args *", NULL },
        { "nfsv3", "op-lookup-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-lookup-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-lookup-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-lookup-done", 2, 3, "LOOKUP3res *", NULL },
        { "nfsv3", "op-access-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-lookup-done", 2, 3, "LOOKUP3res *", NULL },
        { "nfsv3", "op-access-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-access-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-access-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-access-start", 2, 3, "ACCESS3args *", NULL },
        { "nfsv3", "op-access-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-access-start", 2, 3, "ACCESS3args *", NULL },
        { "nfsv3", "op-access-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-access-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-access-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-access-done", 2, 3, "ACCESS3res *", NULL },
        { "nfsv3", "op-commit-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-access-done", 2, 3, "ACCESS3res *", NULL },
        { "nfsv3", "op-commit-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-commit-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-commit-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-commit-start", 2, 3, "COMMIT3args *", NULL },
        { "nfsv3", "op-commit-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-commit-start", 2, 3, "COMMIT3args *", NULL },
        { "nfsv3", "op-commit-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-commit-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-commit-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-commit-done", 2, 3, "COMMIT3res *", NULL },
        { "nfsv3", "op-create-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-commit-done", 2, 3, "COMMIT3res *", NULL },
        { "nfsv3", "op-create-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-create-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-create-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-create-start", 2, 3, "CREATE3args *", NULL },
        { "nfsv3", "op-create-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-create-start", 2, 3, "CREATE3args *", NULL },
        { "nfsv3", "op-create-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-create-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-create-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-create-done", 2, 3, "CREATE3res *", NULL },
        { "nfsv3", "op-fsinfo-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-create-done", 2, 3, "CREATE3res *", NULL },
        { "nfsv3", "op-fsinfo-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-fsinfo-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-fsinfo-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-fsinfo-start", 2, 3, "FSINFO3args *", NULL },
        { "nfsv3", "op-fsinfo-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-fsinfo-start", 2, 3, "FSINFO3args *", NULL },
        { "nfsv3", "op-fsinfo-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-fsinfo-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-fsinfo-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-fsinfo-done", 2, 3, "FSINFO3res *", NULL },
        { "nfsv3", "op-fsstat-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-fsinfo-done", 2, 3, "FSINFO3res *", NULL },
        { "nfsv3", "op-fsstat-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-fsstat-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-fsstat-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-fsstat-start", 2, 3, "FSSTAT3args *", NULL },
        { "nfsv3", "op-fsstat-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-fsstat-start", 2, 3, "FSSTAT3args *", NULL },
        { "nfsv3", "op-fsstat-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-fsstat-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-fsstat-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-fsstat-done", 2, 3, "FSSTAT3res *", NULL },
        { "nfsv3", "op-link-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-fsstat-done", 2, 3, "FSSTAT3res *", NULL },
        { "nfsv3", "op-link-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-link-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-link-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-link-start", 2, 3, "LINK3args *", NULL },
        { "nfsv3", "op-link-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-link-start", 2, 3, "LINK3args *", NULL },
        { "nfsv3", "op-link-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-link-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-link-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-link-done", 2, 3, "LINK3res *", NULL },
        { "nfsv3", "op-mkdir-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-link-done", 2, 3, "LINK3res *", NULL },
        { "nfsv3", "op-mkdir-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-mkdir-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-mkdir-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-mkdir-start", 2, 3, "MKDIR3args *", NULL },
        { "nfsv3", "op-mkdir-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-mkdir-start", 2, 3, "MKDIR3args *", NULL },
        { "nfsv3", "op-mkdir-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-mkdir-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-mkdir-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-mkdir-done", 2, 3, "MKDIR3res *", NULL },
        { "nfsv3", "op-mknod-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-mkdir-done", 2, 3, "MKDIR3res *", NULL },
        { "nfsv3", "op-mknod-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-mknod-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-mknod-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-mknod-start", 2, 3, "MKNOD3args *", NULL },
        { "nfsv3", "op-mknod-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-mknod-start", 2, 3, "MKNOD3args *", NULL },
        { "nfsv3", "op-mknod-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-mknod-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-mknod-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-mknod-done", 2, 3, "MKNOD3res *", NULL },
        { "nfsv3", "op-null-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-mknod-done", 2, 3, "MKNOD3res *", NULL },
        { "nfsv3", "op-null-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-null-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-null-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-null-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-null-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-null-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-null-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-pathconf-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-pathconf-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-pathconf-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-pathconf-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-pathconf-start", 2, 3, "PATHCONF3args *", NULL },
        { "nfsv3", "op-pathconf-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-pathconf-start", 2, 3, "PATHCONF3args *", NULL },
        { "nfsv3", "op-pathconf-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-pathconf-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-pathconf-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-pathconf-done", 2, 3, "PATHCONF3res *", NULL },
        { "nfsv3", "op-read-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-pathconf-done", 2, 3, "PATHCONF3res *", NULL },
        { "nfsv3", "op-read-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-read-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-read-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-read-start", 2, 3, "READ3args *", NULL },
        { "nfsv3", "op-read-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-read-start", 2, 3, "READ3args *", NULL },
        { "nfsv3", "op-read-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-read-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-read-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-read-done", 2, 3, "READ3res *", NULL },
        { "nfsv3", "op-readdir-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-read-done", 2, 3, "READ3res *", NULL },
        { "nfsv3", "op-readdir-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-readdir-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-readdir-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-readdir-start", 2, 3, "READDIR3args *", NULL },
        { "nfsv3", "op-readdir-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-readdir-start", 2, 3, "READDIR3args *", NULL },
        { "nfsv3", "op-readdir-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-readdir-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-readdir-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-readdir-done", 2, 3, "READDIR3res *", NULL },
        { "nfsv3", "op-readdirplus-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-readdir-done", 2, 3, "READDIR3res *", NULL },
        { "nfsv3", "op-readdirplus-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-readdirplus-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-readdirplus-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-readdirplus-start", 2, 3, "READDIRPLUS3args *", NULL },
        { "nfsv3", "op-readdirplus-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-readdirplus-start", 2, 3, "READDIRPLUS3args *", NULL },
        { "nfsv3", "op-readdirplus-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-readdirplus-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-readdirplus-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-readdirplus-done", 2, 3, "READDIRPLUS3res *", NULL },
        { "nfsv3", "op-readlink-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-readdirplus-done", 2, 3, "READDIRPLUS3res *", NULL },
        { "nfsv3", "op-readlink-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-readlink-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-readlink-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-readlink-start", 2, 3, "READLINK3args *", NULL },
        { "nfsv3", "op-readlink-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-readlink-start", 2, 3, "READLINK3args *", NULL },
        { "nfsv3", "op-readlink-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-readlink-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-readlink-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-readlink-done", 2, 3, "READLINK3res *", NULL },
        { "nfsv3", "op-remove-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-readlink-done", 2, 3, "READLINK3res *", NULL },
        { "nfsv3", "op-remove-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-remove-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-remove-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-remove-start", 2, 3, "REMOVE3args *", NULL },
        { "nfsv3", "op-remove-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-remove-start", 2, 3, "REMOVE3args *", NULL },
        { "nfsv3", "op-remove-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-remove-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-remove-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-remove-done", 2, 3, "REMOVE3res *", NULL },
        { "nfsv3", "op-rename-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-remove-done", 2, 3, "REMOVE3res *", NULL },
        { "nfsv3", "op-rename-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-rename-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-rename-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-rename-start", 2, 3, "RENAME3args *", NULL },
        { "nfsv3", "op-rename-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-rename-start", 2, 3, "RENAME3args *", NULL },
        { "nfsv3", "op-rename-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-rename-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-rename-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-rename-done", 2, 3, "RENAME3res *", NULL },
        { "nfsv3", "op-rmdir-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-rename-done", 2, 3, "RENAME3res *", NULL },
        { "nfsv3", "op-rmdir-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-rmdir-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-rmdir-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-rmdir-start", 2, 3, "RMDIR3args *", NULL },
        { "nfsv3", "op-rmdir-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-rmdir-start", 2, 3, "RMDIR3args *", NULL },
        { "nfsv3", "op-rmdir-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-rmdir-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-rmdir-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-rmdir-done", 2, 3, "RMDIR3res *", NULL },
        { "nfsv3", "op-setattr-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-rmdir-done", 2, 3, "RMDIR3res *", NULL },
        { "nfsv3", "op-setattr-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-setattr-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-setattr-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-setattr-start", 2, 3, "SETATTR3args *", NULL },
        { "nfsv3", "op-setattr-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-setattr-start", 2, 3, "SETATTR3args *", NULL },
        { "nfsv3", "op-setattr-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-setattr-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-setattr-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-setattr-done", 2, 3, "SETATTR3res *", NULL },
        { "nfsv3", "op-symlink-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-setattr-done", 2, 3, "SETATTR3res *", NULL },
        { "nfsv3", "op-symlink-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-symlink-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-symlink-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-symlink-start", 2, 3, "SYMLINK3args *", NULL },
        { "nfsv3", "op-symlink-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-symlink-start", 2, 3, "SYMLINK3args *", NULL },
        { "nfsv3", "op-symlink-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-symlink-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-symlink-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-symlink-done", 2, 3, "SYMLINK3res *", NULL },
        { "nfsv3", "op-write-start", 0, 0, "struct svc_req *",
        { "nfsv3", "op-symlink-done", 2, 3, "SYMLINK3res *", NULL },
        { "nfsv3", "op-write-start", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-write-start", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-write-start", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-write-start", 2, 3, "WRITE3args *", NULL },
        { "nfsv3", "op-write-done", 0, 0, "struct svc_req *",
        { "nfsv3", "op-write-start", 2, 3, "WRITE3args *", NULL },
        { "nfsv3", "op-write-done", 0, 0, "struct svc_req *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv3", "op-write-done", 1, 1, "nfsv3oparg_t *",
        { "nfsv3", "op-write-done", 1, 1, "nfsv3oparg_t *",
-           "nfsv3opinfo_t *" },
+         "nfsv3opinfo_t *" },
        { "nfsv3", "op-write-done", 2, 3, "WRITE3res *", NULL },
 
        { "nfsv4", "null-start", 0, 0, "struct svc_req *", "conninfo_t *" },
        { "nfsv4", "null-done", 0, 0, "struct svc_req *", "conninfo_t *" },
        { "nfsv4", "compound-start", 0, 0, "struct compound_state *",
        { "nfsv3", "op-write-done", 2, 3, "WRITE3res *", NULL },
 
        { "nfsv4", "null-start", 0, 0, "struct svc_req *", "conninfo_t *" },
        { "nfsv4", "null-done", 0, 0, "struct svc_req *", "conninfo_t *" },
        { "nfsv4", "compound-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "compound-start", 1, 0, "struct compound_state *",
        { "nfsv4", "compound-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "compound-start", 2, 1, "COMPOUND4args *", NULL },
        { "nfsv4", "compound-done", 0, 0, "struct compound_state *",
        { "nfsv4", "compound-start", 2, 1, "COMPOUND4args *", NULL },
        { "nfsv4", "compound-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "compound-done", 1, 0, "struct compound_state *",
        { "nfsv4", "compound-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "compound-done", 2, 1, "COMPOUND4res *", NULL },
        { "nfsv4", "op-access-start", 0, 0, "struct compound_state *",
        { "nfsv4", "compound-done", 2, 1, "COMPOUND4res *", NULL },
        { "nfsv4", "op-access-start", 0, 0, "struct compound_state *",
-           "conninfo_t *"},
+         "conninfo_t *"},
        { "nfsv4", "op-access-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-access-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-access-start", 2, 1, "ACCESS4args *", NULL },
        { "nfsv4", "op-access-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-access-start", 2, 1, "ACCESS4args *", NULL },
        { "nfsv4", "op-access-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-access-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-access-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-access-done", 2, 1, "ACCESS4res *", NULL },
        { "nfsv4", "op-close-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-access-done", 2, 1, "ACCESS4res *", NULL },
        { "nfsv4", "op-close-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-close-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-close-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-close-start", 2, 1, "CLOSE4args *", NULL },
        { "nfsv4", "op-close-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-close-start", 2, 1, "CLOSE4args *", NULL },
        { "nfsv4", "op-close-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-close-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-close-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-close-done", 2, 1, "CLOSE4res *", NULL },
        { "nfsv4", "op-commit-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-close-done", 2, 1, "CLOSE4res *", NULL },
        { "nfsv4", "op-commit-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-commit-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-commit-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-commit-start", 2, 1, "COMMIT4args *", NULL },
        { "nfsv4", "op-commit-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-commit-start", 2, 1, "COMMIT4args *", NULL },
        { "nfsv4", "op-commit-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-commit-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-commit-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-commit-done", 2, 1, "COMMIT4res *", NULL },
        { "nfsv4", "op-create-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-commit-done", 2, 1, "COMMIT4res *", NULL },
        { "nfsv4", "op-create-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-create-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-create-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-create-start", 2, 1, "CREATE4args *", NULL },
        { "nfsv4", "op-create-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-create-start", 2, 1, "CREATE4args *", NULL },
        { "nfsv4", "op-create-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-create-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-create-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-create-done", 2, 1, "CREATE4res *", NULL },
        { "nfsv4", "op-delegpurge-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-create-done", 2, 1, "CREATE4res *", NULL },
        { "nfsv4", "op-delegpurge-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-delegpurge-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-delegpurge-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-delegpurge-start", 2, 1, "DELEGPURGE4args *", NULL },
        { "nfsv4", "op-delegpurge-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-delegpurge-start", 2, 1, "DELEGPURGE4args *", NULL },
        { "nfsv4", "op-delegpurge-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-delegpurge-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-delegpurge-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-delegpurge-done", 2, 1, "DELEGPURGE4res *", NULL },
        { "nfsv4", "op-delegreturn-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-delegpurge-done", 2, 1, "DELEGPURGE4res *", NULL },
        { "nfsv4", "op-delegreturn-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-delegreturn-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-delegreturn-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-delegreturn-start", 2, 1, "DELEGRETURN4args *", NULL },
        { "nfsv4", "op-delegreturn-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-delegreturn-start", 2, 1, "DELEGRETURN4args *", NULL },
        { "nfsv4", "op-delegreturn-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-delegreturn-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-delegreturn-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-delegreturn-done", 2, 1, "DELEGRETURN4res *", NULL },
        { "nfsv4", "op-getattr-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-delegreturn-done", 2, 1, "DELEGRETURN4res *", NULL },
        { "nfsv4", "op-getattr-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-getattr-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-getattr-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-getattr-start", 2, 1, "GETATTR4args *", NULL },
        { "nfsv4", "op-getattr-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-getattr-start", 2, 1, "GETATTR4args *", NULL },
        { "nfsv4", "op-getattr-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-getattr-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-getattr-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-getattr-done", 2, 1, "GETATTR4res *", NULL },
        { "nfsv4", "op-getfh-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-getattr-done", 2, 1, "GETATTR4res *", NULL },
        { "nfsv4", "op-getfh-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-getfh-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-getfh-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-getfh-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-getfh-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-getfh-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-getfh-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-getfh-done", 2, 1, "GETFH4res *", NULL },
        { "nfsv4", "op-link-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-getfh-done", 2, 1, "GETFH4res *", NULL },
        { "nfsv4", "op-link-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-link-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-link-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-link-start", 2, 1, "LINK4args *", NULL },
        { "nfsv4", "op-link-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-link-start", 2, 1, "LINK4args *", NULL },
        { "nfsv4", "op-link-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-link-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-link-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-link-done", 2, 1, "LINK4res *", NULL },
        { "nfsv4", "op-lock-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-link-done", 2, 1, "LINK4res *", NULL },
        { "nfsv4", "op-lock-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-lock-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-lock-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-lock-start", 2, 1, "LOCK4args *", NULL },
        { "nfsv4", "op-lock-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-lock-start", 2, 1, "LOCK4args *", NULL },
        { "nfsv4", "op-lock-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-lock-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-lock-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-lock-done", 2, 1, "LOCK4res *", NULL },
        { "nfsv4", "op-lockt-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-lock-done", 2, 1, "LOCK4res *", NULL },
        { "nfsv4", "op-lockt-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-lockt-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-lockt-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-lockt-start", 2, 1, "LOCKT4args *", NULL },
        { "nfsv4", "op-lockt-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-lockt-start", 2, 1, "LOCKT4args *", NULL },
        { "nfsv4", "op-lockt-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-lockt-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-lockt-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-lockt-done", 2, 1, "LOCKT4res *", NULL },
        { "nfsv4", "op-locku-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-lockt-done", 2, 1, "LOCKT4res *", NULL },
        { "nfsv4", "op-locku-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-locku-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-locku-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-locku-start", 2, 1, "LOCKU4args *", NULL },
        { "nfsv4", "op-locku-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-locku-start", 2, 1, "LOCKU4args *", NULL },
        { "nfsv4", "op-locku-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-locku-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-locku-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-locku-done", 2, 1, "LOCKU4res *", NULL },
        { "nfsv4", "op-lookup-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-locku-done", 2, 1, "LOCKU4res *", NULL },
        { "nfsv4", "op-lookup-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-lookup-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-lookup-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-lookup-start", 2, 1, "LOOKUP4args *", NULL },
        { "nfsv4", "op-lookup-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-lookup-start", 2, 1, "LOOKUP4args *", NULL },
        { "nfsv4", "op-lookup-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-lookup-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-lookup-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-lookup-done", 2, 1, "LOOKUP4res *", NULL },
        { "nfsv4", "op-lookupp-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-lookup-done", 2, 1, "LOOKUP4res *", NULL },
        { "nfsv4", "op-lookupp-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-lookupp-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-lookupp-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-lookupp-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-lookupp-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-lookupp-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-lookupp-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-lookupp-done", 2, 1, "LOOKUPP4res *", NULL },
        { "nfsv4", "op-nverify-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-lookupp-done", 2, 1, "LOOKUPP4res *", NULL },
        { "nfsv4", "op-nverify-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-nverify-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-nverify-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-nverify-start", 2, 1, "NVERIFY4args *", NULL },
        { "nfsv4", "op-nverify-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-nverify-start", 2, 1, "NVERIFY4args *", NULL },
        { "nfsv4", "op-nverify-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-nverify-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-nverify-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-nverify-done", 2, 1, "NVERIFY4res *", NULL },
        { "nfsv4", "op-open-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-nverify-done", 2, 1, "NVERIFY4res *", NULL },
        { "nfsv4", "op-open-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-open-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-open-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-open-start", 2, 1, "OPEN4args *", NULL },
        { "nfsv4", "op-open-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-open-start", 2, 1, "OPEN4args *", NULL },
        { "nfsv4", "op-open-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-open-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-open-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-open-done", 2, 1, "OPEN4res *", NULL },
        { "nfsv4", "op-open-confirm-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-open-done", 2, 1, "OPEN4res *", NULL },
        { "nfsv4", "op-open-confirm-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-open-confirm-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-open-confirm-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-open-confirm-start", 2, 1, "OPEN_CONFIRM4args *", NULL },
        { "nfsv4", "op-open-confirm-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-open-confirm-start", 2, 1, "OPEN_CONFIRM4args *", NULL },
        { "nfsv4", "op-open-confirm-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-open-confirm-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-open-confirm-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-open-confirm-done", 2, 1, "OPEN_CONFIRM4res *", NULL },
        { "nfsv4", "op-open-downgrade-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-open-confirm-done", 2, 1, "OPEN_CONFIRM4res *", NULL },
        { "nfsv4", "op-open-downgrade-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-open-downgrade-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-open-downgrade-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-open-downgrade-start", 2, 1, "OPEN_DOWNGRADE4args *", NULL },
        { "nfsv4", "op-open-downgrade-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-open-downgrade-start", 2, 1, "OPEN_DOWNGRADE4args *", NULL },
        { "nfsv4", "op-open-downgrade-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-open-downgrade-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-open-downgrade-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-open-downgrade-done", 2, 1, "OPEN_DOWNGRADE4res *", NULL },
        { "nfsv4", "op-openattr-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-open-downgrade-done", 2, 1, "OPEN_DOWNGRADE4res *", NULL },
        { "nfsv4", "op-openattr-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-openattr-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-openattr-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-openattr-start", 2, 1, "OPENATTR4args *", NULL },
        { "nfsv4", "op-openattr-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-openattr-start", 2, 1, "OPENATTR4args *", NULL },
        { "nfsv4", "op-openattr-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-openattr-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-openattr-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-openattr-done", 2, 1, "OPENATTR4res *", NULL },
        { "nfsv4", "op-putfh-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-openattr-done", 2, 1, "OPENATTR4res *", NULL },
        { "nfsv4", "op-putfh-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-putfh-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-putfh-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-putfh-start", 2, 1, "PUTFH4args *", NULL },
        { "nfsv4", "op-putfh-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-putfh-start", 2, 1, "PUTFH4args *", NULL },
        { "nfsv4", "op-putfh-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-putfh-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-putfh-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-putfh-done", 2, 1, "PUTFH4res *", NULL },
        { "nfsv4", "op-putpubfh-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-putfh-done", 2, 1, "PUTFH4res *", NULL },
        { "nfsv4", "op-putpubfh-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-putpubfh-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-putpubfh-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-putpubfh-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-putpubfh-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-putpubfh-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-putpubfh-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-putpubfh-done", 2, 1, "PUTPUBFH4res *", NULL },
        { "nfsv4", "op-putrootfh-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-putpubfh-done", 2, 1, "PUTPUBFH4res *", NULL },
        { "nfsv4", "op-putrootfh-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-putrootfh-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-putrootfh-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-putrootfh-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-putrootfh-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-putrootfh-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-putrootfh-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-putrootfh-done", 2, 1, "PUTROOTFH4res *", NULL },
        { "nfsv4", "op-read-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-putrootfh-done", 2, 1, "PUTROOTFH4res *", NULL },
        { "nfsv4", "op-read-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-read-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-read-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-read-start", 2, 1, "READ4args *", NULL },
        { "nfsv4", "op-read-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-read-start", 2, 1, "READ4args *", NULL },
        { "nfsv4", "op-read-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-read-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-read-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-read-done", 2, 1, "READ4res *", NULL },
        { "nfsv4", "op-readdir-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-read-done", 2, 1, "READ4res *", NULL },
        { "nfsv4", "op-readdir-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-readdir-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-readdir-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-readdir-start", 2, 1, "READDIR4args *", NULL },
        { "nfsv4", "op-readdir-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-readdir-start", 2, 1, "READDIR4args *", NULL },
        { "nfsv4", "op-readdir-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-readdir-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-readdir-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-readdir-done", 2, 1, "READDIR4res *", NULL },
        { "nfsv4", "op-readlink-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-readdir-done", 2, 1, "READDIR4res *", NULL },
        { "nfsv4", "op-readlink-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-readlink-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-readlink-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-readlink-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-readlink-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-readlink-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-readlink-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-readlink-done", 2, 1, "READLINK4res *", NULL },
        { "nfsv4", "op-release-lockowner-start", 0, 0,
        { "nfsv4", "op-readlink-done", 2, 1, "READLINK4res *", NULL },
        { "nfsv4", "op-release-lockowner-start", 0, 0,
-           "struct compound_state *", "conninfo_t *" },
+         "struct compound_state *", "conninfo_t *" },
        { "nfsv4", "op-release-lockowner-start", 1, 0,
        { "nfsv4", "op-release-lockowner-start", 1, 0,
-           "struct compound_state *", "nfsv4opinfo_t *" },
+         "struct compound_state *", "nfsv4opinfo_t *" },
        { "nfsv4", "op-release-lockowner-start", 2, 1,
        { "nfsv4", "op-release-lockowner-start", 2, 1,
-           "RELEASE_LOCKOWNER4args *", NULL },
+         "RELEASE_LOCKOWNER4args *", NULL },
        { "nfsv4", "op-release-lockowner-done", 0, 0,
        { "nfsv4", "op-release-lockowner-done", 0, 0,
-           "struct compound_state *", "conninfo_t *" },
+         "struct compound_state *", "conninfo_t *" },
        { "nfsv4", "op-release-lockowner-done", 1, 0,
        { "nfsv4", "op-release-lockowner-done", 1, 0,
-           "struct compound_state *", "nfsv4opinfo_t *" },
+         "struct compound_state *", "nfsv4opinfo_t *" },
        { "nfsv4", "op-release-lockowner-done", 2, 1,
        { "nfsv4", "op-release-lockowner-done", 2, 1,
-           "RELEASE_LOCKOWNER4res *", NULL },
+         "RELEASE_LOCKOWNER4res *", NULL },
        { "nfsv4", "op-remove-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-remove-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-remove-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-remove-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-remove-start", 2, 1, "REMOVE4args *", NULL },
        { "nfsv4", "op-remove-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-remove-start", 2, 1, "REMOVE4args *", NULL },
        { "nfsv4", "op-remove-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-remove-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-remove-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-remove-done", 2, 1, "REMOVE4res *", NULL },
        { "nfsv4", "op-rename-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-remove-done", 2, 1, "REMOVE4res *", NULL },
        { "nfsv4", "op-rename-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-rename-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-rename-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-rename-start", 2, 1, "RENAME4args *", NULL },
        { "nfsv4", "op-rename-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-rename-start", 2, 1, "RENAME4args *", NULL },
        { "nfsv4", "op-rename-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-rename-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-rename-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-rename-done", 2, 1, "RENAME4res *", NULL },
        { "nfsv4", "op-renew-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-rename-done", 2, 1, "RENAME4res *", NULL },
        { "nfsv4", "op-renew-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-renew-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-renew-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-renew-start", 2, 1, "RENEW4args *", NULL },
        { "nfsv4", "op-renew-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-renew-start", 2, 1, "RENEW4args *", NULL },
        { "nfsv4", "op-renew-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-renew-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-renew-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-renew-done", 2, 1, "RENEW4res *", NULL },
        { "nfsv4", "op-restorefh-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-renew-done", 2, 1, "RENEW4res *", NULL },
        { "nfsv4", "op-restorefh-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-restorefh-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-restorefh-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-restorefh-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-restorefh-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-restorefh-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-restorefh-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-restorefh-done", 2, 1, "RESTOREFH4res *", NULL },
        { "nfsv4", "op-savefh-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-restorefh-done", 2, 1, "RESTOREFH4res *", NULL },
        { "nfsv4", "op-savefh-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-savefh-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-savefh-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-savefh-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-savefh-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-savefh-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-savefh-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-savefh-done", 2, 1, "SAVEFH4res *", NULL },
        { "nfsv4", "op-secinfo-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-savefh-done", 2, 1, "SAVEFH4res *", NULL },
        { "nfsv4", "op-secinfo-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-secinfo-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-secinfo-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-secinfo-start", 2, 1, "SECINFO4args *", NULL },
        { "nfsv4", "op-secinfo-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-secinfo-start", 2, 1, "SECINFO4args *", NULL },
        { "nfsv4", "op-secinfo-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-secinfo-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-secinfo-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-secinfo-done", 2, 1, "SECINFO4res *", NULL },
        { "nfsv4", "op-setattr-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-secinfo-done", 2, 1, "SECINFO4res *", NULL },
        { "nfsv4", "op-setattr-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-setattr-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-setattr-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-setattr-start", 2, 1, "SETATTR4args *", NULL },
        { "nfsv4", "op-setattr-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-setattr-start", 2, 1, "SETATTR4args *", NULL },
        { "nfsv4", "op-setattr-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-setattr-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-setattr-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-setattr-done", 2, 1, "SETATTR4res *", NULL },
        { "nfsv4", "op-setclientid-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-setattr-done", 2, 1, "SETATTR4res *", NULL },
        { "nfsv4", "op-setclientid-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-setclientid-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-setclientid-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-setclientid-start", 2, 1, "SETCLIENTID4args *", NULL },
        { "nfsv4", "op-setclientid-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-setclientid-start", 2, 1, "SETCLIENTID4args *", NULL },
        { "nfsv4", "op-setclientid-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-setclientid-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-setclientid-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-setclientid-done", 2, 1, "SETCLIENTID4res *", NULL },
        { "nfsv4", "op-setclientid-confirm-start", 0, 0,
        { "nfsv4", "op-setclientid-done", 2, 1, "SETCLIENTID4res *", NULL },
        { "nfsv4", "op-setclientid-confirm-start", 0, 0,
-           "struct compound_state *", "conninfo_t *" },
+         "struct compound_state *", "conninfo_t *" },
        { "nfsv4", "op-setclientid-confirm-start", 1, 0,
        { "nfsv4", "op-setclientid-confirm-start", 1, 0,
-           "struct compound_state *", "nfsv4opinfo_t *" },
+         "struct compound_state *", "nfsv4opinfo_t *" },
        { "nfsv4", "op-setclientid-confirm-start", 2, 1,
        { "nfsv4", "op-setclientid-confirm-start", 2, 1,
-           "SETCLIENTID_CONFIRM4args *", NULL },
+         "SETCLIENTID_CONFIRM4args *", NULL },
        { "nfsv4", "op-setclientid-confirm-done", 0, 0,
        { "nfsv4", "op-setclientid-confirm-done", 0, 0,
-           "struct compound_state *", "conninfo_t *" },
+         "struct compound_state *", "conninfo_t *" },
        { "nfsv4", "op-setclientid-confirm-done", 1, 0,
        { "nfsv4", "op-setclientid-confirm-done", 1, 0,
-           "struct compound_state *", "nfsv4opinfo_t *" },
+         "struct compound_state *", "nfsv4opinfo_t *" },
        { "nfsv4", "op-setclientid-confirm-done", 2, 1,
        { "nfsv4", "op-setclientid-confirm-done", 2, 1,
-           "SETCLIENTID_CONFIRM4res *", NULL },
+         "SETCLIENTID_CONFIRM4res *", NULL },
        { "nfsv4", "op-verify-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-verify-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-verify-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-verify-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-verify-start", 2, 1, "VERIFY4args *", NULL },
        { "nfsv4", "op-verify-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-verify-start", 2, 1, "VERIFY4args *", NULL },
        { "nfsv4", "op-verify-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-verify-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-verify-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-verify-done", 2, 1, "VERIFY4res *", NULL },
        { "nfsv4", "op-write-start", 0, 0, "struct compound_state *",
        { "nfsv4", "op-verify-done", 2, 1, "VERIFY4res *", NULL },
        { "nfsv4", "op-write-start", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-write-start", 1, 0, "struct compound_state *",
        { "nfsv4", "op-write-start", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-write-start", 2, 1, "WRITE4args *", NULL },
        { "nfsv4", "op-write-done", 0, 0, "struct compound_state *",
        { "nfsv4", "op-write-start", 2, 1, "WRITE4args *", NULL },
        { "nfsv4", "op-write-done", 0, 0, "struct compound_state *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "op-write-done", 1, 0, "struct compound_state *",
        { "nfsv4", "op-write-done", 1, 0, "struct compound_state *",
-           "nfsv4opinfo_t *" },
+         "nfsv4opinfo_t *" },
        { "nfsv4", "op-write-done", 2, 1, "WRITE4res *", NULL },
        { "nfsv4", "cb-recall-start", 0, 0, "rfs4_client_t *",
        { "nfsv4", "op-write-done", 2, 1, "WRITE4res *", NULL },
        { "nfsv4", "cb-recall-start", 0, 0, "rfs4_client_t *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "cb-recall-start", 1, 1, "rfs4_deleg_state_t *",
        { "nfsv4", "cb-recall-start", 1, 1, "rfs4_deleg_state_t *",
-           "nfsv4cbinfo_t *" },
+         "nfsv4cbinfo_t *" },
        { "nfsv4", "cb-recall-start", 2, 2, "CB_RECALL4args *", NULL },
        { "nfsv4", "cb-recall-done", 0, 0, "rfs4_client_t *",
        { "nfsv4", "cb-recall-start", 2, 2, "CB_RECALL4args *", NULL },
        { "nfsv4", "cb-recall-done", 0, 0, "rfs4_client_t *",
-           "conninfo_t *" },
+         "conninfo_t *" },
        { "nfsv4", "cb-recall-done", 1, 1, "rfs4_deleg_state_t *",
        { "nfsv4", "cb-recall-done", 1, 1, "rfs4_deleg_state_t *",
-           "nfsv4cbinfo_t *" },
+         "nfsv4cbinfo_t *" },
        { "nfsv4", "cb-recall-done", 2, 2, "CB_RECALL4res *", NULL },
 
        { "ip", "send", 0, 0, "struct mbuf *", "pktinfo_t *" },
        { "nfsv4", "cb-recall-done", 2, 2, "CB_RECALL4res *", NULL },
 
        { "ip", "send", 0, 0, "struct mbuf *", "pktinfo_t *" },
@@ -887,11 +899,7 @@ sdt_argdesc_t sdt_args[] = {
        { "mptcp", "checksum-result", 0, 0, "struct tcpcb *", "tcpsinfo_t *" },
        { "mptcp", "checksum-result", 1, 1, "struct mbuf *", "pktinfo_t *" },
        { "mptcp", "checksum-result", 2, 2, "uint32_t", "uint32_t" },
        { "mptcp", "checksum-result", 0, 0, "struct tcpcb *", "tcpsinfo_t *" },
        { "mptcp", "checksum-result", 1, 1, "struct mbuf *", "pktinfo_t *" },
        { "mptcp", "checksum-result", 2, 2, "uint32_t", "uint32_t" },
-       { "mptcp", "session-create", 0, 0, "struct socket *", "socketinfo_t *"},
-       { "mptcp", "session-create", 1, 1, "struct sockbuf *", "socketbuf_t *"},
-       { "mptcp", "session-create", 2, 2, "struct sockbuf *", "socketbuf_t *"},
-       { "mptcp", "session-create", 3, 3, "struct mppcb *", "mppsinfo_t *" },
-       { "mptcp", "session-create", 4, 4, "int", "int" },
+       { "mptcp", "session-create", 0, 0, "struct mppcb *", "mppsinfo_t *" },
        { "mptcp", "session-destroy", 0, 0, "struct mptses *", "mptsesinfo_t *" },
        { "mptcp", "session-destroy", 1, 1, "struct mptcb *", "mptsinfo_t *" },
        { "mptcp", "subflow-create", 0, 0, "struct mptses *", "mptsesinfo_t *"},
        { "mptcp", "session-destroy", 0, 0, "struct mptses *", "mptsesinfo_t *" },
        { "mptcp", "session-destroy", 1, 1, "struct mptcb *", "mptsinfo_t *" },
        { "mptcp", "subflow-create", 0, 0, "struct mptses *", "mptsesinfo_t *"},
@@ -909,11 +917,6 @@ sdt_argdesc_t sdt_args[] = {
        { "mptcp", "subflow-receive", 0, 0, "struct socket *", "socketinfo_t *" },
        { "mptcp", "subflow-receive", 1, 1, "struct sockbuf *", "socketbuf_t *" },
        { "mptcp", "subflow-receive", 2, 2, "struct sockbuf *", "socketbuf_t *" },
        { "mptcp", "subflow-receive", 0, 0, "struct socket *", "socketinfo_t *" },
        { "mptcp", "subflow-receive", 1, 1, "struct sockbuf *", "socketbuf_t *" },
        { "mptcp", "subflow-receive", 2, 2, "struct sockbuf *", "socketbuf_t *" },
-       { "mptcp", "subflow-peeloff", 0, 0, "struct mptses *", "mptsesinfo_t *",},
-       { "mptcp", "subflow-peeloff", 1, 1, "struct mptsub *", "mptsubinfo_t *",},
-       { "mptcp", "subflow-peeloff", 2, 2, "struct socket *", "socketinfo_t *",},
-       { "mptcp", "subflow-peeloff", 3, 3, "struct sockbuf *", "socketbuf_t *" },
-       { "mptcp", "subflow-peeloff", 4, 4, "struct sockbuf *", "socketbuf_t *" },
        { "mptcp", "subflow-input", 0, 0, "struct mptses *", "mptsesinfo_t *" },
        { "mptcp", "subflow-input", 1, 1, "struct mptsub *", "mptsubinfo_t *" },
        { "mptcp", "subflow-output", 0, 0, "struct mptses *", "mptsesinfo_t *"},
        { "mptcp", "subflow-input", 0, 0, "struct mptses *", "mptsesinfo_t *" },
        { "mptcp", "subflow-input", 1, 1, "struct mptsub *", "mptsubinfo_t *" },
        { "mptcp", "subflow-output", 0, 0, "struct mptses *", "mptsesinfo_t *"},
@@ -955,9 +958,23 @@ sdt_argdesc_t sdt_args[] = {
        { "mptcp", "disconnectx", 2, 2, "sae_connid_t", "sae_connid_t" },
        { "mptcp", "disconnectx", 3, 3, "struct socket *", "sockinfo_t *" },
        { "mptcp", "disconnectx", 4, 4, "struct mptcb *", "mptsinfo_t *" },
        { "mptcp", "disconnectx", 2, 2, "sae_connid_t", "sae_connid_t" },
        { "mptcp", "disconnectx", 3, 3, "struct socket *", "sockinfo_t *" },
        { "mptcp", "disconnectx", 4, 4, "struct mptcb *", "mptsinfo_t *" },
-       { "mptcp", "peeloff", 0, 0, "struct mptses *", "mptsesinfo_t *" },
-       { "mptcp", "peeloff", 1, 1, "sae_associd_t", "sae_associd_t" },
-       { "mptcp", "peeloff", 2, 2, "struct socket *", "sockinfo_t *" },
+       {"vminfo", "kalloc", 0, 0, "vm_size_t", "vm_size_t" },
+       {"vminfo", "kalloc", 1, 1, "vm_size_t", "vm_size_t" },
+       {"vminfo", "kalloc", 2, 2, "void*", "void*" },
+       {"vminfo", "kfree", 0, 0, "vm_size_t", "vm_size_t" },
+       {"vminfo", "kfree", 1, 1, "vm_size_t", "vm_size_t" },
+       {"vminfo", "kfree", 2, 2, "void*", "void*" },
+       {"vminfo", "zalloc", 0, 0, "zone_t", "zone_t" },
+       {"vminfo", "zalloc", 1, 1, "void*", "void*" },
+       {"vminfo", "zfree", 0, 0, "zone_t", "zone_t" },
+       {"vminfo", "zfree", 1, 1, "void*", "void*" },
+       {"hv", "guest-enter", 0, 0, "uint32_t", "uint32_t" },
+       {"hv", "guest-enter", 1, 1, "uint64_t *", "guest_regs_t *" },
+       {"hv", "guest-exit", 0, 0, "uint32_t", "uint32_t" },
+       {"hv", "guest-exit", 1, 1, "uint64_t *", "guest_regs_t *" },
+       {"hv", "guest-error", 0, 0, "uint32_t", "uint32_t" },
+       {"hv", "guest-error", 1, 1, "uint64_t *", "guest_regs_t *" },
+       {"hv", "guest-error", 2, 2, "uint32_t", "uint32_t" },
        { NULL, NULL, 0, 0, NULL, NULL }
 };
 
        { NULL, NULL, 0, 0, NULL, NULL }
 };
 
@@ -975,21 +992,26 @@ sdt_getargdesc(void *arg, dtrace_id_t id, void *parg, dtrace_argdesc_t *desc)
        for (i = 0; sdt_args[i].sda_provider != NULL; i++) {
                sdt_argdesc_t *a = &sdt_args[i];
 
        for (i = 0; sdt_args[i].sda_provider != NULL; i++) {
                sdt_argdesc_t *a = &sdt_args[i];
 
-               if (strncmp(sdp->sdp_provider->sdtp_name, a->sda_provider, strlen(a->sda_provider) + 1) != 0)
+               if (strncmp(sdp->sdp_provider->sdtp_name, a->sda_provider, strlen(a->sda_provider) + 1) != 0) {
                        continue;
                        continue;
+               }
 
                if (a->sda_name != NULL &&
 
                if (a->sda_name != NULL &&
-                   strncmp(sdp->sdp_name, a->sda_name, strlen(a->sda_name) + 1) != 0)
+                   strncmp(sdp->sdp_name, a->sda_name, strlen(a->sda_name) + 1) != 0) {
                        continue;
                        continue;
+               }
 
 
-               if (desc->dtargd_ndx != a->sda_ndx)
+               if (desc->dtargd_ndx != a->sda_ndx) {
                        continue;
                        continue;
+               }
 
 
-               if (a->sda_native != NULL)
+               if (a->sda_native != NULL) {
                        (void) strlcpy(desc->dtargd_native, a->sda_native, DTRACE_ARGTYPELEN);
                        (void) strlcpy(desc->dtargd_native, a->sda_native, DTRACE_ARGTYPELEN);
+               }
 
 
-               if (a->sda_xlate != NULL)
+               if (a->sda_xlate != NULL) {
                        (void) strlcpy(desc->dtargd_xlate, a->sda_xlate, DTRACE_ARGTYPELEN);
                        (void) strlcpy(desc->dtargd_xlate, a->sda_xlate, DTRACE_ARGTYPELEN);
+               }
 
                desc->dtargd_mapping = a->sda_mapping;
                return;
 
                desc->dtargd_mapping = a->sda_mapping;
                return;
mirror of XNU