svn commit: r205744 - stable/8/sys/kern

[Bjoern A. Zeeb]

Author: bz
Date: Sat Mar 27 17:11:06 2010
New Revision: 205744
URL: http://svn.freebsd.org/changeset/base/205744

Log:
  MFC r202123:
  
    Change DDB show prison:
    - name some columns more closely to the user space variables,
      as we do for host.* or allow.* (in the listing) already.
    - print pr_childmax (children.max).
    - prefix hex values with 0x.

Modified:
  stable/8/sys/kern/kern_jail.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/kern/kern_jail.c
==============================================================================
--- stable/8/sys/kern/kern_jail.c	Sat Mar 27 16:55:48 2010	(r205743)
+++ stable/8/sys/kern/kern_jail.c	Sat Mar 27 17:11:06 2010	(r205744)
@@ -4276,10 +4276,11 @@ db_show_prison(struct prison *pr)
 #endif
 	db_printf(" root            = %p\n", pr->pr_root);
 	db_printf(" securelevel     = %d\n", pr->pr_securelevel);
-	db_printf(" childcount      = %d\n", pr->pr_childcount);
+	db_printf(" children.max    = %d\n", pr->pr_childmax);
+	db_printf(" children.cur    = %d\n", pr->pr_childcount);
 	db_printf(" child           = %p\n", LIST_FIRST(&pr->pr_children));
 	db_printf(" sibling         = %p\n", LIST_NEXT(pr, pr_sibling));
-	db_printf(" flags           = %x", pr->pr_flags);
+	db_printf(" flags           = 0x%x", pr->pr_flags);
 	for (fi = 0; fi < sizeof(pr_flag_names) / sizeof(pr_flag_names[0]);
 	    fi++)
 		if (pr_flag_names[fi] != NULL && (pr->pr_flags & (1 << fi)))
@@ -4294,7 +4295,7 @@ db_show_prison(struct prison *pr)
 		    : (jsf == pr_flag_jailsys[fi].new) ? "new"
 		    : "inherit");
 	}
-	db_printf(" allow           = %x", pr->pr_allow);
+	db_printf(" allow           = 0x%x", pr->pr_allow);
 	for (fi = 0; fi < sizeof(pr_allow_names) / sizeof(pr_allow_names[0]);
 	    fi++)
 		if (pr_allow_names[fi] != NULL && (pr->pr_allow & (1 << fi)))
@@ -4309,14 +4310,14 @@ db_show_prison(struct prison *pr)
 	db_printf(" ip4s            = %d\n", pr->pr_ip4s);
 	for (ii = 0; ii < pr->pr_ip4s; ii++)
 		db_printf(" %s %s\n",
-		    ii == 0 ? "ip4             =" : "                 ",
+		    ii == 0 ? "ip4.addr        =" : "                 ",
 		    inet_ntoa(pr->pr_ip4[ii]));
 #endif
 #ifdef INET6
 	db_printf(" ip6s            = %d\n", pr->pr_ip6s);
 	for (ii = 0; ii < pr->pr_ip6s; ii++)
 		db_printf(" %s %s\n",
-		    ii == 0 ? "ip6             =" : "                 ",
+		    ii == 0 ? "ip6.addr        =" : "                 ",
 		    ip6_sprintf(ip6buf, &pr->pr_ip6[ii]));
 #endif
 }