From owner-svn-src-projects@FreeBSD.ORG  Fri Feb 11 15:03:42 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8086F10656AB;
	Fri, 11 Feb 2011 15:03:42 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6FB1C8FC13;
	Fri, 11 Feb 2011 15:03:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1BF3goW064282;
	Fri, 11 Feb 2011 15:03:42 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BF3gEx064280;
	Fri, 11 Feb 2011 15:03:42 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102111503.p1BF3gEx064280@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 11 Feb 2011 15:03:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218572 - projects/graid/head/sys/geom/raid
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Feb 2011 15:03:42 -0000

Author: mav
Date: Fri Feb 11 15:03:42 2011
New Revision: 218572
URL: http://svn.freebsd.org/changeset/base/218572

Log:
  Add information about subdisks into the `graid list` output.

Modified:
  projects/graid/head/sys/geom/raid/g_raid.c

Modified: projects/graid/head/sys/geom/raid/g_raid.c
==============================================================================
--- projects/graid/head/sys/geom/raid/g_raid.c	Fri Feb 11 15:03:05 2011	(r218571)
+++ projects/graid/head/sys/geom/raid/g_raid.c	Fri Feb 11 15:03:42 2011	(r218572)
@@ -1995,7 +1995,7 @@ g_raid_dumpconf(struct sbuf *sb, const c
 		vol = pp->private;
 		g_topology_unlock();
 		sx_xlock(&sc->sc_lock);
-		sbuf_printf(sb, "%s<VolumeName>%s</VolumeName>\n", indent,
+		sbuf_printf(sb, "%s<Label>%s</Label>\n", indent,
 		    vol->v_name);
 		sbuf_printf(sb, "%s<RAIDLevel>%s</RAIDLevel>\n", indent,
 		    g_raid_volume_level2str(vol->v_raid_level,
@@ -2038,6 +2038,16 @@ g_raid_dumpconf(struct sbuf *sb, const c
 			sbuf_printf(sb, ")");
 		}
 		sbuf_printf(sb, "</State>\n");
+		sbuf_printf(sb, "%s<Subdisks>", indent);
+		TAILQ_FOREACH(sd, &disk->d_subdisks, sd_next) {
+			sbuf_printf(sb, "r%d(%s):%d@%ju",
+			    sd->sd_volume->v_global_id,
+			    sd->sd_volume->v_name,
+			    sd->sd_pos, sd->sd_offset);
+			if (TAILQ_NEXT(sd, sd_next))
+				sbuf_printf(sb, ", ");
+		}
+		sbuf_printf(sb, "</Subdisks>\n");
 		sbuf_printf(sb, "%s<ReadErrors>%d</ReadErrors>\n", indent,
 		    disk->d_read_errs);
 		sx_xunlock(&sc->sc_lock);