--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/lib/fm/topo/files/SUNW,Sun-Blade-T6300/Makefile	Sat Nov 04 01:18:55 2006 -0800
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+
+PLATFORMS = SUNW,Sun-Blade-T6300
+CLASS = platform
+DTDFILE = 
+TOPOFILE = hc-topology.xml
+SRCDIR = ../SUNW,Sun-Blade-T6300
+
+include ../Makefile.file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/lib/fm/topo/modules/common/pcibus/pcifn_enum.c	Sat Nov 04 01:18:55 2006 -0800
@@ -0,0 +1,122 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <limits.h>
+#include <fm/libtopo.h>
+#include "did.h"
+#include "did_props.h"
+#include "pcifn_enum.h"
+
+static topo_mod_t *
+module_load(topo_mod_t *mp, tnode_t *parent, const char *name)
+{
+	topo_mod_t *rp = NULL;
+	char *plat, *mach;
+	char *path;
+	char *rootdir;
+	int err;
+
+	plat = mach = NULL;
+
+	if (topo_prop_get_string(parent,
+	    TOPO_PGROUP_SYSTEM, TOPO_PROP_PLATFORM, &plat, &err) < 0) {
+		(void) topo_mod_seterrno(mp, err);
+		return (NULL);
+	}
+	if (topo_prop_get_string(parent,
+	    TOPO_PGROUP_SYSTEM, TOPO_PROP_MACHINE, &mach, &err) < 0) {
+		(void) topo_mod_seterrno(mp, err);
+		return (NULL);
+	}
+	path = topo_mod_alloc(mp, PATH_MAX);
+	rootdir = topo_mod_rootdir(mp);
+	(void) snprintf(path, PATH_MAX,
+	    PATH_TEMPLATE, rootdir ? rootdir : "", plat, name);
+
+	if ((rp = topo_mod_load(mp, path)) == NULL) {
+		topo_mod_dprintf(mp, "Unable to load %s.\n", path);
+		(void) snprintf(path, PATH_MAX,
+		    PATH_TEMPLATE, rootdir ? rootdir : "", mach, name);
+		if ((rp = topo_mod_load(mp, path)) == NULL)
+			topo_mod_dprintf(mp, "Unable to load %s.\n", path);
+	}
+	topo_mod_strfree(mp, plat);
+	topo_mod_strfree(mp, mach);
+	topo_mod_free(mp, path, PATH_MAX);
+	return (rp);
+}
+
+static int
+module_run(topo_mod_t *mp, tnode_t *parent, pfn_enum_t *ep)
+{
+	return (topo_mod_enumerate(mp, parent,
+	    ep->pfne_modname, ep->pfne_childname,
+	    ep->pfne_imin, ep->pfne_imax));
+}
+
+int
+pcifn_enum(topo_mod_t *mp, tnode_t *parent)
+{
+	char *ccstr;
+	int rv = 0;
+	int i, e;
+	uint_t cc;
+	topo_mod_t *child_mod;
+
+	topo_mod_dprintf(mp, "Enumerating beneath pci(ex) function.\n");
+
+	/*
+	 * Extract the class code of the PCI function and make sure
+	 * it matches the type that the module cares about.
+	 */
+	if (topo_prop_get_string(parent,
+	    TOPO_PGROUP_PCI, TOPO_PROP_CLASS, &ccstr, &e) < 0)
+		return (0);
+	if (sscanf(ccstr, "%x", &cc) != 1) {
+		topo_mod_strfree(mp, ccstr);
+		return (0);
+	}
+	topo_mod_strfree(mp, ccstr);
+	cc = cc >> 16;
+
+	for (i = 0; i < Pcifn_enumerator_count; i++) {
+
+		if (cc != Pcifn_enumerators[i].pfne_class)
+			continue;
+
+		child_mod = module_load(mp, parent,
+		    Pcifn_enumerators[i].pfne_modname);
+
+		if (child_mod) {
+			rv = module_run(mp, parent,
+			    &Pcifn_enumerators[i]) != 0 ? -1 : 0;
+			topo_mod_unload(child_mod);
+		}
+	}
+	return (rv);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/lib/fm/topo/modules/common/pcibus/pcifn_enum.h	Sat Nov 04 01:18:55 2006 -0800
@@ -0,0 +1,65 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef	_PCIFN_ENUM_H
+#define	_PCIFN_ENUM_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <sys/types.h>
+#include <sys/pci.h>
+#include <fm/topo_mod.h>
+
+#define	PATH_TEMPLATE "%s/usr/platform/%s/lib/fm/topo/plugins/%s.so"
+
+/*
+ * When a pci or pci-express function is enumerated in the topology
+ * we'll attempt to load modules that can expand the topology
+ * beneath that function.  This data structure helps us track which modules
+ * to attempt to load, whether or not the loading was successful
+ * so we don't waste time trying again, and if loading is successful,
+ * the module pointer returned by topo_mod_load().
+ */
+typedef struct pfn_enum {
+	uint_t pfne_class;	/* expected PCI class of the parent function */
+	const char *pfne_modname; /* enumerator module name */
+	const char *pfne_childname; /* name of nodes to enumerate */
+	topo_instance_t pfne_imin; /* minimum instance number to enumerate */
+	topo_instance_t pfne_imax; /* maximum instance number to enumerate */
+} pfn_enum_t;
+
+/*
+ * The current list of modules to potentially load and expand topology
+ * beneath pci(-express) functions.
+ */
+pfn_enum_t Pcifn_enumerators[] = {
+	{ PCI_CLASS_MASS, "sata", "sata-port", 0, 7	},
+	{ PCI_CLASS_MASS, "scsi", "disk", 0, 15		}
+};
+
+int Pcifn_enumerator_count = sizeof (Pcifn_enumerators) / sizeof (pfn_enum_t);
+
+#endif /* _PCIFN_ENUM_H */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/lib/fm/topo/modules/sun4v/ioboard/Makefile	Sat Nov 04 01:18:55 2006 -0800
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+
+CLASS = arch
+ARCH = sun4v
+
+include ../../sun4/ioboard/Makefile.iob

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/lib/fm/topo/modules/sun4v/ioboard/iob_platform.c	Sat Nov 04 01:18:55 2006 -0800
@@ -0,0 +1,169 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+/*
+ * SUNW,Sun-Fire platform ioboard topology enumerator
+ */
+
+#include <string.h>
+#include <libdevinfo.h>
+#include <fm/topo_mod.h>
+#include <sys/fm/protocol.h>
+
+#include <ioboard.h>
+#include <hostbridge.h>
+#include <util.h>
+
+#define	IOBOARD	"ioboard"
+#define	LABEL	"IOBD"
+#define	IOBDFRU	"hc:///component="LABEL
+#define	ERIE	"SUNW,Sun-Fire-T1000"
+#define	ERIE2	"SUNW,SPARC-Enterprise-T1000"
+#define	HB_MAX	1
+
+/*ARGSUSED*/
+int
+platform_iob_label(tnode_t *node, nvlist_t *ignored, nvlist_t **out,
+    topo_mod_t *mod)
+{
+	return (0);
+}
+
+static tnode_t *
+iob_node_create(tnode_t *parent, topo_mod_t *mod)
+{
+	int err;
+	tnode_t *ion;
+	nvlist_t *fmri, *args = NULL, *pfmri = NULL;
+	topo_hdl_t *thp = topo_mod_handle(mod);
+
+	(void) topo_node_resource(parent, &pfmri, &err);
+	if (pfmri != NULL) {
+		if (topo_mod_nvalloc(mod, &args, NV_UNIQUE_NAME) != 0 ||
+		    nvlist_add_nvlist(args, TOPO_METH_FMRI_ARG_PARENT, pfmri)
+		    != 0) {
+			nvlist_free(pfmri);
+			nvlist_free(args);
+			(void) topo_mod_seterrno(mod, EMOD_FMRI_NVL);
+			return (NULL);
+		}
+		nvlist_free(pfmri);
+	}
+
+	if ((fmri = topo_fmri_create(thp, FM_FMRI_SCHEME_HC, IOBOARD, 0, args,
+		&err)) == NULL) {
+		topo_mod_dprintf(mod, "creation of tnode for ioboard=0 "
+		    "failed: %s\n", topo_strerror(err));
+		(void) topo_mod_seterrno(mod, err);
+		nvlist_free(args);
+		return (NULL);
+	}
+	nvlist_free(args);
+	ion = topo_node_bind(mod, parent, IOBOARD, 0, fmri, NULL);
+	if (ion == NULL) {
+		nvlist_free(fmri);
+		topo_mod_dprintf(mod, "unable to bind ioboard=0: %s",
+		    topo_strerror(topo_mod_errno(mod)));
+		return (NULL); /* mod_errno already set */
+	}
+	nvlist_free(fmri);
+
+	if (topo_fmri_str2nvl(thp, IOBDFRU, &fmri, &err) == 0) {
+		(void) topo_node_fru_set(ion, fmri, 0, &err);
+		nvlist_free(fmri);
+	}
+	(void) topo_node_label_set(ion, "IOBD", &err);
+
+	return (ion);
+}
+
+/*ARGSUSED*/
+int
+platform_iob_enum(tnode_t *parent, topo_instance_t imin, topo_instance_t imax,
+    did_hash_t *didhash, di_prom_handle_t promtree, topo_mod_t *mod)
+{
+	int err;
+	tnode_t *ion;
+	char *plat;
+
+	if (topo_prop_get_string(parent,
+	    TOPO_PGROUP_SYSTEM, TOPO_PROP_PLATFORM, &plat, &err) < 0) {
+		return (topo_mod_seterrno(mod, err));
+	}
+
+	/*
+	 * The SUNW,SunFireT1000 (Erie) platform links in the SUNW,SunFireT200
+	 * (Ontario) top-level /usr/platform/SUNW,SunFireT200 and its
+	 * hc-topology. Unfortunately, the SUNW,SunFireT1000 does not contain an
+	 * ioboard.  For SUNW,SunFireT1000 systems, we must begin the I/O
+	 * topology directly below the motherboard.
+	 *
+	 * To further the mess, on the SUNW,SunFireT200 (Ontario) platform, a
+	 * mistake was made with the topology defintion.  The ioboard was made
+	 * a peer to the motherboard.  This is incorrect in terms of
+	 * what we allow for an hc topology according the Fault
+	 * Managed Resources specification and what is physically
+	 * possible in the system.  Nevertheless, a change to
+	 * the topology will result in mis-diagnoses for systems
+	 * that have already shipped. In the interest of backward
+	 * compatibility, we continue to allow the
+	 * ioboard to be a peer to the motherboard SUNW,SunFireT200 systems.
+	 */
+	if ((strcmp(plat, ERIE) == 0) ||
+	    (strcmp(plat, ERIE2) == 0)) {
+		if (strcmp(topo_node_name(parent), "motherboard") != 0) {
+			topo_mod_strfree(mod, plat);
+			return (0);
+		}
+		ion = parent;
+	} else if (strcmp(topo_node_name(parent), "motherboard") == 0) {
+		topo_mod_strfree(mod, plat);
+		return (0);
+	} else {
+		ion = iob_node_create(parent, mod);
+	}
+
+	topo_mod_strfree(mod, plat);
+
+	if (ion == NULL) {
+		topo_mod_dprintf(mod, "Enumeration of ioboard failed: %s\n",
+		    topo_strerror(topo_mod_errno(mod)));
+		return (-1); /* mod_errno already set */
+	}
+
+	if (child_range_add(mod, ion, HOSTBRIDGE, 0, HB_MAX) < 0 ||
+	    topo_mod_enumerate(mod, ion, HOSTBRIDGE, HOSTBRIDGE, 0, HB_MAX)
+	    < 0) {
+		topo_mod_dprintf(mod, "Enumeration of %s=%d "
+		    "failed: %s\n", HOSTBRIDGE, 0,
+		    topo_strerror(topo_mod_errno(mod)));
+		return (-1); /* mod_errno already set */
+	}
+
+	return (0);
+}

--- a/usr/src/cmd/fm/eversholt/files/Makefile.com	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/eversholt/files/Makefile.com	Sat Nov 04 01:18:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -52,7 +51,7 @@
 	$(USR_PLAT_EFT_FILES) $(ROOT_COMMON_EFT_FILES)
 
 %.eft: ../common/%.esc
-	$(ESC) -o $@ $<
+	$(ESC) -I$(ROOT)/usr/include  -o $@ $<
 
 %.eft: %.esc
 	$(ESC) -o $@ $<

--- a/usr/src/cmd/fm/eversholt/files/common/pci.esc	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/eversholt/files/common/pci.esc	Sat Nov 04 01:18:55 2006 -0800
@@ -27,6 +27,8 @@
 
 #pragma dictionary "PCI"
 
+#include <fm/topo_hc.h>
+
 #define PCI_DEV_FIT 1000
 #define PCI_BUS_FIT 500
 
@@ -50,17 +52,17 @@
 #define NONFATAL_DPE_D_TIME 168h
 
 #define	IS_LEAF \
-	(confprop(asru(pcibus/pcidev/pcifn), "CLASS-CODE") != "60400" && \
-	confprop(asru(pcibus/pcidev/pcifn), "CLASS-CODE") != "60401")
+	(confprop(asru(pcibus/pcidev/pcifn), TOPO_PCI_CLASS) != "60400" && \
+	confprop(asru(pcibus/pcidev/pcifn), TOPO_PCI_CLASS) != "60401")
 
 #define	IS_BDG \
-	(confprop(asru(pcibus/pcidev/pcifn), "CLASS-CODE") == "60400" || \
-	confprop(asru(pcibus/pcidev/pcifn), "CLASS-CODE") == "60401")
+	(confprop(asru(pcibus/pcidev/pcifn), TOPO_PCI_CLASS) == "60400" || \
+	confprop(asru(pcibus/pcidev/pcifn), TOPO_PCI_CLASS) == "60401")
 
 #define	FD_IS_LEAF \
-	(confprop(asru(pcibus/pcidev[fromdev]/pcifn), "CLASS-CODE") != \
+	(confprop(asru(pcibus/pcidev[fromdev]/pcifn), TOPO_PCI_CLASS) != \
 	"60400" && \
-	confprop(asru(pcibus/pcidev[fromdev]/pcifn), "CLASS-CODE") != "60401")
+	confprop(asru(pcibus/pcidev[fromdev]/pcifn), TOPO_PCI_CLASS) != "60401")
 
 /*
  * note general rule for errors is that for upstream propagations

--- a/usr/src/cmd/fm/eversholt/files/common/pciex.esc	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/eversholt/files/common/pciex.esc	Sat Nov 04 01:18:55 2006 -0800
@@ -27,6 +27,8 @@
 
 #pragma dictionary "PCIEX"
 
+#include <fm/topo_hc.h>
+
 /*
  * FIT rates - assume leaf devices are somewhat less reliable than
  * root complexes, switches and bridges
@@ -87,7 +89,7 @@
 
 #define SOURCE_ID_MATCHES_OWN_BDF \
 	(payloadprop("source-valid") == 1 && \
-	payloadprop("source-id") == (confprop(asru(pciexrc), "BDF") + 0))
+	payloadprop("source-id") == (confprop(asru(pciexrc), TOPO_PCI_BDF) + 0))
 
 /*
  * Other useful macros. These use the EXCAP property (PCI Express Capabilities
@@ -109,35 +111,39 @@
 	is_under(pciexbus/pciexdev/pciexfn, pcibus[b]/pcidev[d]/pcifn[f])
 
 #define IS_SWD \
-	(confprop(asru(pciexbus/pciexdev/pciexfn), "EXCAP") == "pciexswd")
+	(confprop(asru(pciexbus/pciexdev/pciexfn), TOPO_PCI_EXCAP) == \
+	"pciexswd")
 
 #define IS_SWU \
-	(confprop(asru(pciexbus/pciexdev/pciexfn), "EXCAP") == "pciexswu")
+	(confprop(asru(pciexbus/pciexdev/pciexfn), TOPO_PCI_EXCAP) == \
+	"pciexswu")
 
 #define IS_LEAF \
-	(confprop(asru(pciexbus/pciexdev/pciexfn), "EXCAP") == "pciexdev")
+	(confprop(asru(pciexbus/pciexdev/pciexfn), TOPO_PCI_EXCAP) == \
+	"pciexdev")
 
 #define	IS_PCI_LEAF \
-	(confprop(asru(pcibus/pcidev/pcifn), "CLASS-CODE") != "60400" && \
-	confprop(asru(pcibus/pcidev/pcifn), "CLASS-CODE") != "60401")
+	(confprop(asru(pcibus/pcidev/pcifn), TOPO_PCI_CLASS) != "60400" && \
+	confprop(asru(pcibus/pcidev/pcifn), TOPO_PCI_CLASS) != "60401")
 
 #define	BDF_IS_PCI_LEAF \
-	(confprop(asru(pcibus[b]/pcidev[d]/pcifn[f]),"CLASS-CODE") != \
+	(confprop(asru(pcibus[b]/pcidev[d]/pcifn[f]),TOPO_PCI_CLASS) != \
 	"60400" && \
-	confprop(asru(pcibus[b]/pcidev[d]/pcifn[f]), "CLASS-CODE") != "60401")
+	confprop(asru(pcibus[b]/pcidev[d]/pcifn[f]), TOPO_PCI_CLASS) != "60401")
 
 #define	BDF_IS_PCI_IMM_LEAF \
-	(confprop(asru(pciexfn/pcibus[b]/pcidev[d]/pcifn[f]),"CLASS-CODE") != \
-	"60400" && \
-	confprop(asru(pciexfn/pcibus[b]/pcidev[d]/pcifn[f]), "CLASS-CODE") != \
-	"60401")
+	(confprop(asru(pciexfn/pcibus[b]/pcidev[d]/pcifn[f]),TOPO_PCI_CLASS) \
+	!= "60400" && \
+	confprop(asru(pciexfn/pcibus[b]/pcidev[d]/pcifn[f]), TOPO_PCI_CLASS) \
+	!= "60401")
 
 #define IS_BDG \
-	(confprop(asru(pciexbus/pciexdev/pciexfn), "EXCAP") == "pcibus")
+	(confprop(asru(pciexbus/pciexdev/pciexfn), TOPO_PCI_EXCAP) == \
+	"pcibus")
 
 #define BDF_IS_LEAF \
-	(confprop(asru(pciexbus[b]/pciexdev[d]/pciexfn[f]), "EXCAP") == \
-	"pciexdev")
+	(confprop(asru(pciexbus[b]/pciexdev[d]/pciexfn[f]), \
+	TOPO_PCI_EXCAP) == "pciexdev")
 
 /*
  * define faults
@@ -1837,11 +1843,11 @@
 
 prop error.io.pciex.badreq-u@pciexbus[b]/pciexdev[d] (0)->
     ereport.io.pciex.tl.ur@pciexfn {
-	(confprop(asru(pciexfn), "EXCAP") == "pciexswd") &&
+	(confprop(asru(pciexfn), TOPO_PCI_EXCAP) == "pciexswd") &&
 	(payloadprop("source-valid") == 0 ||
 	(payloadprop("source-id") & 0xfff8) == ((b << 8) | (d << 3))) },
     ereport.io.pciex.tl.ca@pciexfn {
-	(confprop(asru(pciexfn), "EXCAP") == "pciexswd") &&
+	(confprop(asru(pciexfn), TOPO_PCI_EXCAP) == "pciexswd") &&
 	(payloadprop("source-valid") == 0 ||
 	(payloadprop("source-id") & 0xfff8) == ((b << 8) | (d << 3))) };
 

--- a/usr/src/cmd/fm/fmd/Makefile.fmd	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/fmd/Makefile.fmd	Sat Nov 04 01:18:55 2006 -0800
@@ -66,6 +66,7 @@
 	fmd_thread.c \
 	fmd_time.c \
 	fmd_timerq.c \
+	fmd_topo.c \
 	fmd_trace.c \
 	fmd_ustat.c \
 	fmd_xdr_adm.c \

--- a/usr/src/cmd/fm/fmd/common/fmd.c	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/fmd/common/fmd.c	Sat Nov 04 01:18:55 2006 -0800
@@ -31,7 +31,6 @@
 #include <sys/param.h>
 #include <sys/systeminfo.h>
 #include <sys/fm/util.h>
-#include <fm/libtopo.h>
 
 #include <smbios.h>
 #include <limits.h>
@@ -60,6 +59,7 @@
 #include <fmd_idspace.h>
 #include <fmd_rpc.h>
 #include <fmd_dr.h>
+#include <fmd_topo.h>
 #include <fmd_xprt.h>
 #include <fmd_ctl.h>
 #include <sys/openpromio.h>
@@ -313,6 +313,8 @@
 { "fltlog.enospc", FMD_TYPE_UINT64, "events not appended to fltlog (ENOSPC)" },
 { "log.enospc", FMD_TYPE_UINT64, "events not appended to other logs (ENOSPC)" },
 { "dr.gen", FMD_TYPE_UINT64, "dynamic reconfiguration generation" },
+{ "topo.gen", FMD_TYPE_UINT64, "topology snapshot generation" },
+{ "topo.drgen", FMD_TYPE_UINT64, "current topology DR generation number" },
 };
 
 void
@@ -371,6 +373,7 @@
 	(void) pthread_mutex_init(&dp->d_thr_lock, NULL);
 	(void) pthread_mutex_init(&dp->d_mod_lock, NULL);
 	(void) pthread_mutex_init(&dp->d_stats_lock, NULL);
+	(void) pthread_mutex_init(&dp->d_topo_lock, NULL);
 	(void) pthread_rwlock_init(&dp->d_log_lock, NULL);
 
 	/*
@@ -614,8 +617,7 @@
 	if (dp->d_conf != NULL)
 		fmd_conf_close(dp->d_conf);
 
-	if (dp->d_topo != NULL)
-		topo_close(dp->d_topo);
+	fmd_topo_fini();
 
 	nvlist_free(dp->d_auth);
 	(void) nv_alloc_fini(&dp->d_nva);
@@ -736,7 +738,7 @@
 	const char *name;
 	fmd_conf_path_t *pap;
 	fmd_event_t *e;
-	int dbout, err;
+	int dbout;
 
 	/*
 	 * Cache all the current debug property settings in d_fmd_debug,
@@ -768,10 +770,7 @@
 	name = dp->d_rootdir != NULL &&
 	    *dp->d_rootdir != '\0' ? dp->d_rootdir : NULL;
 
-	if ((dp->d_topo = topo_open(TOPO_VERSION, name, &err)) == NULL) {
-		fmd_error(EFMD_EXIT, "failed to initialize "
-		    "topology library: %s\n", topo_strerror(err));
-	}
+	fmd_topo_init();
 
 	dp->d_clockptr = dp->d_clockops->fto_init();
 	dp->d_xprt_ids = fmd_idspace_create("xprt_ids", 1, INT_MAX);

--- a/usr/src/cmd/fm/fmd/common/fmd.h	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/fmd/common/fmd.h	Sat Nov 04 01:18:55 2006 -0800
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -60,6 +59,8 @@
 	fmd_stat_t ds_flt_enospc;	/* number of events w/ ENOSPC fltlog */
 	fmd_stat_t ds_oth_enospc;	/* number of events w/ ENOSPC others */
 	fmd_stat_t ds_dr_gen;		/* dynamic reconfiguration generation */
+	fmd_stat_t ds_topo_gen;		/* topology snapshot generation */
+	fmd_stat_t ds_topo_drgen;	/* topology DR generation */
 } fmd_statistics_t;
 
 typedef struct fmd {
@@ -110,7 +111,8 @@
 	void *d_dr_hdl;			/* DR event handle (see fmd_dr.c) */
 	nv_alloc_t d_nva;		/* libnvpair allocator handle */
 	nvlist_t *d_auth;		/* FMRI authority nvlist */
-	struct topo_hdl *d_topo;	/* libtopo handle */
+	pthread_mutex_t d_topo_lock;	/* lock for topo hdl */
+	fmd_list_t d_topo_list;		/* list of all topology snapshots */
 
 	struct fmd_conf *d_conf;	/* global configuration properties */
 	uint_t d_fg;			/* cached value of "fg" property */

--- a/usr/src/cmd/fm/fmd/common/fmd_api.c	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/fmd/common/fmd_api.c	Sat Nov 04 01:18:55 2006 -0800
@@ -28,7 +28,6 @@
 
 #include <sys/types.h>
 #include <sys/fm/protocol.h>
-#include <fm/libtopo.h>
 
 #include <unistd.h>
 #include <signal.h>
@@ -52,6 +51,7 @@
 #include <fmd_buf.h>
 #include <fmd_asru.h>
 #include <fmd_fmri.h>
+#include <fmd_topo.h>
 #include <fmd_ckpt.h>
 #include <fmd_xprt.h>
 
@@ -701,7 +701,8 @@
 		    "fmd version %d != client version %d\n", TOPO_VERSION, v);
 	}
 
-	thp = fmd.d_topo;
+	thp = fmd_topo_handle(v);
+
 	fmd_module_unlock(mp);
 	return (thp);
 }

--- a/usr/src/cmd/fm/fmd/common/fmd_fmri.c	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/fmd/common/fmd_fmri.c	Sat Nov 04 01:18:55 2006 -0800
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -37,10 +36,9 @@
 #include <fmd_string.h>
 #include <fmd_scheme.h>
 #include <fmd_fmri.h>
+#include <fmd_topo.h>
 #include <fmd.h>
 
-#include <fm/libtopo.h>
-
 /*
  * Interfaces to be used by the plugins
  */
@@ -234,8 +232,7 @@
 struct topo_hdl *
 fmd_fmri_topology(int version)
 {
-	ASSERT(version == TOPO_VERSION);
-	return (fmd.d_topo);
+	return (fmd_topo_handle(version));
 }
 
 /*

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/fmd/common/fmd_topo.c	Sat Nov 04 01:18:55 2006 -0800
@@ -0,0 +1,128 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+/*
+ * FMD Topology Handling
+ *
+ * Fault manager scheme and module plug-ins may need access to the latest
+ * libtopo snapshot.  Upon fmd initialization, a snapshot is taken and
+ * made available via fmd_fmri_topology() and fmd_hdl_topology().  Each
+ * of these routines returns a libtopo snapshot handle back to the caller.
+ * New snapshots are taken if and when a DR event causes the DR generation
+ * number to increase.  The current snapshot is retained to assure consistency
+ * for modules still using older snapshots and the latest snapshot handle is
+ * returned to the caller.
+ */
+
+#include <fmd_alloc.h>
+#include <fmd_error.h>
+#include <fmd_subr.h>
+#include <fmd_topo.h>
+#include <fmd.h>
+
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <fm/fmd_fmri.h>
+#include <fm/libtopo.h>
+
+static void
+fmd_topo_update(void)
+{
+	int err;
+	topo_hdl_t *tp;
+	fmd_topo_t *ftp;
+	char *id;
+	const char *name;
+
+	ASSERT(MUTEX_HELD(&fmd.d_topo_lock));
+
+	name = fmd.d_rootdir != NULL &&
+	    *fmd.d_rootdir != '\0' ? fmd.d_rootdir : NULL;
+
+	/*
+	 * Update the topology snapshot.
+	 */
+	if ((tp = topo_open(TOPO_VERSION, name, &err)) == NULL)
+		fmd_panic("failed to open topology library: %s",
+		    topo_strerror(err));
+
+	if ((id = topo_snap_hold(tp, NULL, &err)) == NULL)
+		fmd_panic("failed to get topology snapshot: %s",
+		    topo_strerror(err));
+
+	topo_hdl_strfree(tp, id);
+
+	ftp = fmd_alloc(sizeof (fmd_topo_t), FMD_SLEEP);
+	ftp->ft_hdl = tp;
+	fmd.d_stats->ds_topo_gen.fmds_value.ui64++;
+	fmd_list_prepend(&fmd.d_topo_list, ftp);
+
+}
+
+topo_hdl_t *
+fmd_topo_handle(int version)
+{
+	uint64_t curgen;
+	fmd_topo_t *ftp;
+
+	if (version != TOPO_VERSION)
+		return (NULL);
+
+	(void) pthread_mutex_lock(&fmd.d_topo_lock);
+	if ((curgen = fmd_fmri_get_drgen()) >
+	    fmd.d_stats->ds_topo_drgen.fmds_value.ui64) {
+		fmd.d_stats->ds_topo_drgen.fmds_value.ui64 = curgen;
+		fmd_topo_update();
+	}
+	ftp = fmd_list_next(&fmd.d_topo_list);
+	(void) pthread_mutex_unlock(&fmd.d_topo_lock);
+
+	return ((topo_hdl_t *)ftp->ft_hdl);
+}
+
+void
+fmd_topo_init(void)
+{
+	(void) pthread_mutex_lock(&fmd.d_topo_lock);
+	fmd_topo_update();
+	(void) pthread_mutex_unlock(&fmd.d_topo_lock);
+}
+
+void
+fmd_topo_fini(void)
+{
+	fmd_topo_t *ftp;
+
+	(void) pthread_mutex_lock(&fmd.d_topo_lock);
+	while ((ftp = fmd_list_next(&fmd.d_topo_list)) != NULL) {
+		fmd_list_delete(&fmd.d_topo_list, ftp);
+		topo_close(ftp->ft_hdl);
+		fmd_free(ftp, sizeof (fmd_topo_t));
+	}
+	(void) pthread_mutex_unlock(&fmd.d_topo_lock);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fm/fmd/common/fmd_topo.h	Sat Nov 04 01:18:55 2006 -0800
@@ -0,0 +1,52 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _FMD_TOPO_H
+#define	_FMD_TOPO_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <fm/libtopo.h>
+
+#include <fmd_list.h>
+
+extern void fmd_topo_init(void);
+extern void fmd_topo_fini(void);
+extern topo_hdl_t *fmd_topo_handle(int);
+
+typedef struct fmd_topo {
+	fmd_list_t ft_list;
+	topo_hdl_t *ft_hdl;
+} fmd_topo_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _FMD_TOPO_H */

--- a/usr/src/cmd/fm/fmtopo/common/fmtopo.c	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/fmtopo/common/fmtopo.c	Sat Nov 04 01:18:55 2006 -0800
@@ -28,39 +28,50 @@
 
 #include <sys/fm/protocol.h>
 #include <fm/libtopo.h>
+#include <ctype.h>
 #include <limits.h>
 #include <strings.h>
 #include <stdio.h>
 #include <errno.h>
+#include <sys/param.h>
 
 #define	FMTOPO_EXIT_SUCCESS	0
 #define	FMTOPO_EXIT_ERROR	1
 #define	FMTOPO_EXIT_USAGE	2
 
+#define	STDERR	"stderr"
+#define	DOTS	"..."
+#define	ALL	"all"
+
 static const char *g_pname;
 
 static const char *opt_R = "/";
+static const char *opt_P = NULL;
 static const char *opt_s = FM_FMRI_SCHEME_HC;
 
-static int opt_e;
-static int opt_d;
-static int opt_v;
-static int opt_V;
+static int opt_e = 0;
+static int opt_d = 0;
+static int opt_V = 0;
+static int opt_p = 0;
+static int opt_x = 0;
 
 static int
 usage(FILE *fp)
 {
 	(void) fprintf(fp,
-	    "Usage: %s [-Cdev] [-R root] [-s scheme]\n", g_pname);
+	    "Usage: %s [-edpvVx] [-Cdev] [-P properties] [-R root] "
+		    "[-s scheme]\n", g_pname);
 
 	(void) fprintf(fp,
 	    "\t-C  dump core after completing execution\n"
-	    "\t-d  set debug mode for libtopo\n"
-	    "\t-e  display nodes as paths using esc/eft notation\n"
+	    "\t-d  set debug mode for libtopo modules\n"
+	    "\t-e  display FMRIs as paths using esc/eft notation\n"
+	    "\t-P  display of FMRI with the specified properties\n"
+	    "\t-p  display of FMRI protocol properties\n"
 	    "\t-R  set root directory for libtopo plug-ins and other files\n"
 	    "\t-s  display topology for the specified FMRI scheme\n"
-	    "\t-v  set verbose mode (display node ASRU, FRU and label)\n"
-	    "\t-V  set verbose mode (display node properties)\n");
+	    "\t-V  set verbose mode\n"
+	    "\t-x  display a xml formatted topology\n");
 
 	return (FMTOPO_EXIT_USAGE);
 }
@@ -89,7 +100,7 @@
 
 	(void) printf("%s\n", name);
 
-	if (opt_v) {
+	if (opt_p) {
 		char *aname = NULL, *fname = NULL, *lname = NULL;
 		nvlist_t *asru = NULL;
 		nvlist_t *fru = NULL;
@@ -120,23 +131,8 @@
 			(void) printf("\tLabel: -\n");
 		}
 	}
-
 	nvlist_free(fmri);
 
-	if (opt_d) {
-		fmri = NULL;
-
-		if (topo_fmri_str2nvl(thp, name, &fmri, &err) < 0) {
-			(void) fprintf(stderr, "%s: failed to convert "
-			    "alternate fmri for %s=%d: %s\n", g_pname,
-			    topo_node_name(node), topo_node_instance(node),
-			    topo_strerror(err));
-		} else {
-			nvlist_print(stderr, fmri);
-			nvlist_free(fmri);
-		}
-	}
-
 	topo_hdl_strfree(thp, name);
 }
 
@@ -194,28 +190,302 @@
 	(void) printf("%s\n", buf);
 }
 
+static void
+print_prop_nameval(topo_hdl_t *thp, nvlist_t *nvl, int skip)
+{
+	int err;
+	topo_type_t type;
+	char *tstr, *propn, buf[48];
+	nvpair_t *pv_nvp;
+
+	if ((pv_nvp = nvlist_next_nvpair(nvl, NULL)) == NULL)
+		return;
+
+	/* Print property name */
+	if ((pv_nvp = nvlist_next_nvpair(nvl, NULL)) == NULL ||
+	    nvpair_name(pv_nvp) == NULL ||
+	    strcmp(TOPO_PROP_VAL_NAME, nvpair_name(pv_nvp)) != 0) {
+		(void) fprintf(stderr, "%s: malformed property name\n",
+		    g_pname);
+		return;
+	} else {
+	    (void) nvpair_value_string(pv_nvp, &propn);
+	}
+
+	if ((pv_nvp = nvlist_next_nvpair(nvl, pv_nvp)) == NULL ||
+	    nvpair_name(pv_nvp) == NULL ||
+	    strcmp(nvpair_name(pv_nvp), TOPO_PROP_VAL_TYPE) != 0 ||
+	    nvpair_type(pv_nvp) != DATA_TYPE_INT32)  {
+		(void) fprintf(stderr, "%s: malformed property type for %s\n",
+		    g_pname, propn);
+		return;
+	} else {
+		(void) nvpair_value_int32(pv_nvp, (int32_t *)&type);
+	}
+
+	switch (type) {
+		case TOPO_TYPE_BOOLEAN: tstr = "boolean"; break;
+		case TOPO_TYPE_INT32: tstr = "int32"; break;
+		case TOPO_TYPE_UINT32: tstr = "uint32"; break;
+		case TOPO_TYPE_INT64: tstr = "int64"; break;
+		case TOPO_TYPE_UINT64: tstr = "uint64"; break;
+		case TOPO_TYPE_STRING: tstr = "string"; break;
+		case TOPO_TYPE_FMRI: tstr = "fmri"; break;
+		case TOPO_TYPE_INT32_ARRAY: tstr = "int32[]"; break;
+		case TOPO_TYPE_UINT32_ARRAY: tstr = "uint32[]"; break;
+		case TOPO_TYPE_INT64_ARRAY: tstr = "int64[]"; break;
+		case TOPO_TYPE_UINT64_ARRAY: tstr = "uint64[]"; break;
+		case TOPO_TYPE_STRING_ARRAY: tstr = "string[]"; break;
+		case TOPO_TYPE_FMRI_ARRAY: tstr = "fmri[]"; break;
+		default: tstr = "unknown type";
+	}
+
+	if (!skip)
+		printf("    %-17s %-8s ", propn, tstr);
+
+	/*
+	 * Get property value
+	 */
+	if (nvpair_name(pv_nvp) == NULL ||
+	    (pv_nvp = nvlist_next_nvpair(nvl, pv_nvp)) == NULL) {
+		(void) fprintf(stderr, "%s: malformed property value\n",
+		    g_pname);
+		return;
+	}
+
+	if (skip)
+		return;
+
+	switch (nvpair_type(pv_nvp)) {
+		case DATA_TYPE_INT32: {
+			int32_t val;
+			(void) nvpair_value_int32(pv_nvp, &val);
+			(void) printf(" %d", val);
+			break;
+		}
+		case DATA_TYPE_UINT32: {
+			uint32_t val;
+			(void) nvpair_value_uint32(pv_nvp, &val);
+			(void) printf(" 0x%x", val);
+			break;
+		}
+		case DATA_TYPE_INT64: {
+			int64_t val;
+			(void) nvpair_value_int64(pv_nvp, &val);
+			(void) printf(" %lld", (longlong_t)val);
+			break;
+		}
+		case DATA_TYPE_UINT64: {
+			uint64_t val;
+			(void) nvpair_value_uint64(pv_nvp, &val);
+			(void) printf(" 0x%llx", (u_longlong_t)val);
+			break;
+		}
+		case DATA_TYPE_STRING: {
+			char *val;
+			(void) nvpair_value_string(pv_nvp, &val);
+			if (!opt_V && strlen(val) > 48) {
+				(void) snprintf(buf, 48, "%s...", val);
+				(void) printf(" %s", buf);
+			} else {
+				(void) printf(" %s", val);
+			}
+			break;
+		}
+		case DATA_TYPE_NVLIST: {
+			nvlist_t *val;
+			char *fmri;
+			(void) nvpair_value_nvlist(pv_nvp, &val);
+			if (topo_fmri_nvl2str(thp, val, &fmri, &err) != 0) {
+				if (opt_V)
+					nvlist_print(stdout, nvl);
+				break;
+			}
+
+			if (!opt_V && strlen(fmri) > 48) {
+				(void) snprintf(buf, 48, "%s", fmri);
+				(void) snprintf(&buf[45], 4, "%s", DOTS);
+				(void) printf(" %s", buf);
+			} else {
+				(void) printf(" %s", fmri);
+			}
+
+			topo_hdl_strfree(thp, fmri);
+			break;
+		}
+		default:
+			(void) fprintf(stderr, " unknown data type (%d)",
+			    nvpair_type(pv_nvp));
+			break;
+		}
+		(void) printf("\n");
+}
+
+static void
+print_pgroup(char *pgn, char *dstab, char *nstab, int32_t version, int skip)
+{
+	char buf[30];
+
+	if (skip)
+		return;
+
+	if (!opt_V && strlen(pgn) > 30) {
+		(void) snprintf(buf, 26, "%s", pgn);
+		(void) snprintf(&buf[27], 4, "%s", DOTS);
+		printf("  group: %-30s version: %-3d stability: %s/%s\n",
+		    buf, version, nstab, dstab);
+	} else {
+		printf("  group: %-30s version: %-3d stability: %s/%s\n",
+		    pgn, version, nstab, dstab);
+	}
+}
+
+static int
+cmp_name(const char *props, char *pgn)
+{
+	char buf[MAXNAMELEN];
+	size_t count;
+	char *begin, *end, *value, *next;
+	char *np;
+
+	if (props == NULL)
+		return (0);
+
+	if (strcmp(props, ALL) == 0)
+		return (0);
+
+
+	value = np = strdup(props);
+
+	for (end = np; *end != '\0'; value = next) {
+		end = strchr(value, ',');
+		if (end != NULL)
+			next = end + 1; /* skip the comma */
+		else
+			next = end = value + strlen(value);
+
+		/*
+		 * Eat up white space at beginning or end of the
+		 * property group name
+		 */
+		begin = value;
+		while (begin < end && isspace(*begin))
+			begin++;
+		while (begin < end && isspace(*(end - 1)))
+			end--;
+
+		if (begin >= end)
+			return (1);
+
+		count = end - begin;
+		count += 1;
+
+		if (count > sizeof (buf))
+			return (1);
+
+		(void) snprintf(buf, count, "%s", begin);
+		if (strcmp(pgn, buf) == 0) {
+			free(np);
+			return (0);
+		}
+	}
+
+	free(np);
+	return (1);
+}
+
+static void
+print_props(topo_hdl_t *thp, nvlist_t *p_nv, const char *props)
+{
+	char *pgn = NULL, *dstab = NULL, *nstab = NULL;
+	int32_t version = 0;
+	nvlist_t *pg_nv, *pv_nv;
+	nvpair_t *nvp, *pg_nvp;
+	int pg_done = 0, skip = 0;
+
+	for (nvp = nvlist_next_nvpair(p_nv, NULL); nvp != NULL;
+	    nvp = nvlist_next_nvpair(p_nv, nvp)) {
+		if (strcmp(TOPO_PROP_GROUP, nvpair_name(nvp)) != 0 ||
+		    nvpair_type(nvp) != DATA_TYPE_NVLIST)
+			continue;
+
+		(void) nvpair_value_nvlist(nvp, &pg_nv);
+		for (pg_nvp = nvlist_next_nvpair(pg_nv, NULL); pg_nvp != NULL;
+		    pg_nvp = nvlist_next_nvpair(pg_nv, pg_nvp)) {
+			/*
+			 * Print property group name and stability levels
+			 */
+			if (strcmp(TOPO_PROP_GROUP_NAME, nvpair_name(pg_nvp))
+			    == 0 && nvpair_type(pg_nvp) == DATA_TYPE_STRING) {
+				(void) nvpair_value_string(pg_nvp, &pgn);
+
+				skip = cmp_name(props, pgn);
+
+			} else if (strcmp(TOPO_PROP_GROUP_NSTAB,
+			    nvpair_name(pg_nvp)) == 0 &&
+			    nvpair_type(pg_nvp) == DATA_TYPE_STRING) {
+				(void) nvpair_value_string(pg_nvp, &nstab);
+			} else if (strcmp(TOPO_PROP_GROUP_DSTAB,
+			    nvpair_name(pg_nvp)) == 0 &&
+			    nvpair_type(pg_nvp) == DATA_TYPE_STRING) {
+				(void) nvpair_value_string(pg_nvp, &dstab);
+			} else if (strcmp(TOPO_PROP_GROUP_VERSION,
+			    nvpair_name(pg_nvp)) == 0 &&
+			    nvpair_type(pg_nvp) == DATA_TYPE_INT32) {
+				(void) nvpair_value_int32(pg_nvp, &version);
+			}
+
+			if (!pg_done) {
+				if (pgn && dstab && nstab && version) {
+					print_pgroup(pgn, dstab, nstab,
+					    version, skip);
+					pg_done++;
+				} else {
+					continue;
+				}
+			/*
+			 * Print property name-value pair
+			 */
+			} else if (strcmp(TOPO_PROP_VAL, nvpair_name(pg_nvp))
+			    == 0 && nvpair_type(pg_nvp) == DATA_TYPE_NVLIST) {
+				(void) nvpair_value_nvlist(pg_nvp, &pv_nv);
+				print_prop_nameval(thp, pv_nv, skip);
+
+			}
+		}
+		pg_done = 0;
+		skip = 0;
+	}
+}
+
 /*ARGSUSED*/
 static int
 print_tnode(topo_hdl_t *thp, tnode_t *node, void *arg)
 {
-	if (opt_e && strcmp(opt_s, FM_FMRI_SCHEME_HC) == 0)
+	int err;
+	nvlist_t *nvl;
+
+	if (opt_e && strcmp(opt_s, FM_FMRI_SCHEME_HC) == 0) {
 		print_everstyle(node);
-	else
-		print_fmri(thp, node);
+		return (TOPO_WALK_NEXT);
+	}
 
-	if (opt_V) {
-		nvlist_t *nvl = topo_prop_get_all(thp, node);
+	print_fmri(thp, node);
 
-		if (nvl == NULL) {
-			(void) fprintf(stderr, "%s: failed to get properties "
-			    "for %s=%d\n", g_pname, topo_node_name(node),
-			    topo_node_instance(node));
+	if (opt_V || opt_P) {
+		if ((nvl = topo_prop_getprops(node, &err)) == NULL) {
+			(void) fprintf(stderr, "%s: failed to get "
+			    "properties for %s=%d: %s\n", g_pname,
+			    topo_node_name(node), topo_node_instance(node),
+			    topo_strerror(err));
 		} else {
-			nvlist_print(stdout, nvl);
+			print_props(thp, nvl, opt_P);
 			nvlist_free(nvl);
 		}
 	}
 
+	printf("\n");
+
 	return (TOPO_WALK_NEXT);
 }
 
@@ -225,12 +495,12 @@
 	topo_hdl_t *thp;
 	topo_walk_t *twp;
 	char *uuid;
-	int c, err;
+	int c, err = 0;
 
 	g_pname = argv[0];
 
 	while (optind < argc) {
-		while ((c = getopt(argc, argv, "aCdeR:s:vV")) != -1) {
+		while ((c = getopt(argc, argv, "aCdeP:pR:s:vVx")) != -1) {
 			switch (c) {
 			case 'C':
 				atexit(abort);
@@ -241,8 +511,11 @@
 			case 'e':
 				opt_e++;
 				break;
-			case 'v':
-				opt_v++;
+			case 'P':
+				opt_P = optarg;
+				break;
+			case 'p':
+				opt_p++;
 				break;
 			case 'V':
 				opt_V++;
@@ -253,6 +526,9 @@
 			case 's':
 				opt_s = optarg;
 				break;
+			case 'x':
+				opt_x++;
+				break;
 			default:
 				return (usage(stderr));
 			}
@@ -272,15 +548,31 @@
 	}
 
 	if (opt_d)
-		topo_debug_set(thp, TOPO_DBG_ALL, "stderr");
+		topo_debug_set(thp, "module", "stderr");
 
 	if ((uuid = topo_snap_hold(thp, NULL, &err)) == NULL) {
 		(void) fprintf(stderr, "%s: failed to snapshot topology: %s\n",
 		    g_pname, topo_strerror(err));
 		topo_close(thp);
 		return (FMTOPO_EXIT_ERROR);
+	} else if (err != 0) {
+		(void) fprintf(stderr, "%s: topology snapshot incomplete\n",
+		    g_pname);
 	}
 
+
+	if (opt_x) {
+		err = 0;
+		if (topo_xml_print(thp, stdout, opt_s, &err) < 0)
+			(void) fprintf(stderr, "%s: failed to print xml "
+			    "formatted topology:%s",  g_pname,
+			    topo_strerror(err));
+
+		topo_hdl_strfree(thp, uuid);
+		topo_snap_release(thp);
+		topo_close(thp);
+		return (err ? FMTOPO_EXIT_ERROR : FMTOPO_EXIT_SUCCESS);
+	}
 	if ((twp = topo_walk_init(thp, opt_s, print_tnode, NULL, &err))
 	    == NULL) {
 		(void) fprintf(stderr, "%s: failed to walk %s topology:"
@@ -293,8 +585,18 @@
 		return (err ? FMTOPO_EXIT_ERROR : FMTOPO_EXIT_SUCCESS);
 	}
 
-	if (!opt_e)
-		(void) printf("Topology Snapshot %s\n", uuid);
+	/*
+	 * Print standard header
+	 */
+	if (!opt_e) {
+		char buf[32];
+		time_t tod = time(NULL);
+
+		printf("TIME                 UUID\n");
+		(void) strftime(buf, sizeof (buf), "%b %d %T", localtime(&tod));
+		(void) printf("%-15s %-32s\n", buf, uuid);
+		(void) printf("\n");
+	}
 
 	topo_hdl_strfree(thp, uuid);
 
@@ -307,9 +609,6 @@
 		return (FMTOPO_EXIT_ERROR);
 	}
 
-	if (opt_d)
-		(void) printf("--------------------\n");
-
 	topo_walk_fini(twp);
 	topo_snap_release(thp);
 	topo_close(thp);

--- a/usr/src/cmd/fm/modules/common/eversholt/config.c	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/modules/common/eversholt/config.c	Sat Nov 04 01:18:55 2006 -0800
@@ -41,6 +41,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <strings.h>
+#include <fm/topo_hc.h>
 #include "alloc.h"
 #include "out.h"
 #include "literals.h"
@@ -341,7 +342,7 @@
 		/*
 		 * If this property is a device path, cache it for quick lookup
 		 */
-		if (pn == stable("DEV")) {
+		if (pn == stable(TOPO_IO_DEV)) {
 			sv = stable(pv);
 			out(O_ALTFP|O_VERB3, "caching %s\n", sv);
 			cdata->devcache = lut_add(cdata->devcache,

--- a/usr/src/cmd/fm/modules/common/eversholt/platform.c	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/modules/common/eversholt/platform.c	Sat Nov 04 01:18:55 2006 -0800
@@ -48,7 +48,9 @@
 #include <sys/param.h>
 #include <sys/fm/protocol.h>
 #include <fm/fmd_api.h>
+#include <fm/fmd_fmri.h>
 #include <fm/libtopo.h>
+#include <fm/topo_hc.h>
 #include "alloc.h"
 #include "out.h"
 #include "tree.h"
@@ -395,6 +397,12 @@
 	char buf[32];	/* big enough for any 64-bit int */
 
 	/*
+	 * malformed prop nvpair
+	 */
+	if (propn == NULL)
+		return;
+
+	/*
 	 * We can only handle properties of string type
 	 */
 	switch (nvpair_type(pv_nvp)) {
@@ -427,6 +435,8 @@
 		break;
 
 	default:
+		out(O_ALTFP, "cfgcollect: failed to get property value for "
+		    "%s", propn);
 		return;
 	}
 
@@ -436,6 +446,9 @@
 	(void) snprintf(rawdata->nextfree,
 	    rawdata->end - rawdata->nextfree, "%s=%s",
 	    propn, propv);
+	if (strcmp(propn, TOPO_PROP_RESOURCE) == 0)
+		out(O_ALTFP, "cfgcollect: %s", propv);
+
 	rawdata->nextfree += addlen;
 
 	if (fmristr != NULL)
@@ -450,7 +463,7 @@
 cfgcollect(topo_hdl_t *thp, tnode_t *node, void *arg)
 {
 	struct cfgdata *rawdata = (struct cfgdata *)arg;
-	int addlen;
+	int err, addlen;
 	char *propn, *path = NULL;
 	nvlist_t *p_nv, *pg_nv, *pv_nv;
 	nvpair_t *nvp, *pg_nvp, *pv_nvp;
@@ -472,7 +485,7 @@
 	 * Better yet, topo properties could be represented as
 	 * a packed nvlist
 	 */
-	p_nv = topo_prop_get_all(thp, node);
+	p_nv = topo_prop_getprops(node, &err);
 	for (nvp = nvlist_next_nvpair(p_nv, NULL); nvp != NULL;
 	    nvp = nvlist_next_nvpair(p_nv, nvp)) {
 		if (strcmp(TOPO_PROP_GROUP, nvpair_name(nvp)) != 0 ||
@@ -490,22 +503,24 @@
 
 			(void) nvpair_value_nvlist(pg_nvp, &pv_nv);
 
+			propn = NULL;
 			for (pv_nvp = nvlist_next_nvpair(pv_nv, NULL);
 			    pv_nvp != NULL;
 			    pv_nvp = nvlist_next_nvpair(pv_nv, pv_nvp)) {
 
 				/* Get property name */
-				propn = nvpair_name(pv_nvp);
-				if (strcmp(TOPO_PROP_VAL_NAME, propn) != 0)
-					continue;
-				if (nvpair_value_string(pv_nvp, &propn) != 0)
-					continue;
+				if (strcmp(TOPO_PROP_VAL_NAME,
+				    nvpair_name(pv_nvp)) == 0)
+					(void) nvpair_value_string(pv_nvp,
+					    &propn);
 
 				/*
 				 * Get property value
 				 */
-				pv_nvp = nvlist_next_nvpair(pv_nv, pv_nvp);
-				add_prop_val(thp, rawdata, propn, pv_nvp);
+				if (strcmp(TOPO_PROP_VAL_VAL,
+				    nvpair_name(pv_nvp)) == 0)
+					add_prop_val(thp, rawdata, propn,
+					    pv_nvp);
 			}
 
 		}
@@ -523,22 +538,21 @@
 platform_config_snapshot(void)
 {
 	int err;
-	char *uuid;
 	topo_walk_t *twp;
+	static uint64_t lastgen;
+	uint64_t curgen;
 
 	/*
-	 *
 	 * If the DR generation number has changed,
 	 * we need to grab a new snapshot, otherwise we
 	 * can simply point them at the last config.
-	 *
-	 *	svgen = DRgen;
-	 *	if (svgen == (Drgen = fmd_drgen_get()) && Lastcfg != NULL) {
-	 *		Lastcfg->refcnt++;
-	 *		return (Lastcfg);
-	 *	}
 	 */
+	if ((curgen = fmd_fmri_get_drgen()) <= lastgen && Lastcfg != NULL) {
+		Lastcfg->refcnt++;
+		return (Lastcfg);
+	}
 
+	lastgen = curgen;
 	/* we're getting a new config, so clean up the last one */
 	if (Lastcfg != NULL)
 		config_free(Lastcfg);
@@ -551,19 +565,16 @@
 	Lastcfg->cpucache = NULL;
 
 	out(O_ALTFP, "platform_config_snapshot(): topo snapshot");
-	if ((uuid = topo_snap_hold(Eft_topo_hdl, NULL, &err)) == NULL)
-		out(O_DIE, "platform_config_snapshot: topo snapshot failed: %s",
-		    topo_strerror(err));
+
+	Eft_topo_hdl = fmd_hdl_topology(Hdl, TOPO_VERSION);
 
 	if ((twp = topo_walk_init(Eft_topo_hdl, FM_FMRI_SCHEME_HC, cfgcollect,
 	    Lastcfg, &err)) == NULL) {
-		topo_hdl_strfree(Eft_topo_hdl, uuid);
 		out(O_DIE, "platform_config_snapshot: NULL topology tree: %s",
 		    topo_strerror(err));
 	}
 
 	if (topo_walk_step(twp, TOPO_WALK_CHILD) == TOPO_WALK_ERR) {
-		topo_hdl_strfree(Eft_topo_hdl, uuid);
 		topo_walk_fini(twp);
 		out(O_DIE, "platform_config_snapshot: error walking topology "
 		    "tree");
@@ -571,8 +582,6 @@
 
 	topo_walk_fini(twp);
 
-	topo_hdl_strfree(Eft_topo_hdl, uuid);
-	topo_snap_release(Eft_topo_hdl);
 
 	return (Lastcfg);
 }
@@ -641,14 +650,15 @@
 	 * Find the driver for this resource and use that to get
 	 * mod and pkg fmris for ASRU and FRU respectively.
 	 */
-	if ((driverstr = cfgstrprop_lookup(croot, path, "DRIVER")) == NULL)
+	if ((driverstr = cfgstrprop_lookup(croot, path, TOPO_IO_DRIVER))
+	    == NULL)
 		return;
 
 	if (topo_hdl_nvalloc(Eft_topo_hdl, &arg, NV_UNIQUE_NAME) != 0) {
 		out(O_ALTFP, "Can not allocate nvlist for MOD fmri lookup");
 		return;
 	}
-	if (nvlist_add_string(arg, "DRIVER", driverstr) != 0) {
+	if (nvlist_add_string(arg, TOPO_IO_DRIVER, driverstr) != 0) {
 		out(O_ALTFP, "Failed to add DRIVER string to arg nvlist");
 		nvlist_free(arg);
 		return;

--- a/usr/src/cmd/fm/modules/i86pc/sfx4500-disk/diskmon_conf.c	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/modules/i86pc/sfx4500-disk/diskmon_conf.c	Sat Nov 04 01:18:55 2006 -0800
@@ -857,7 +857,7 @@
 	u64 = fmd_prop_get_int32(hdl, GLOBAL_PROP_LOG_LEVEL);
 	g_verbose = (int)u64;
 
-	err = update_configuration_from_topo(NULL);
+	err = update_configuration_from_topo(hdl, NULL);
 
 	/* Pull in the properties from the DE configuration file */
 	while (fmd_props[i].fmdp_name != NULL) {

--- a/usr/src/cmd/fm/modules/i86pc/sfx4500-disk/schg_mgr.c	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/modules/i86pc/sfx4500-disk/schg_mgr.c	Sat Nov 04 01:18:55 2006 -0800
@@ -234,7 +234,7 @@
 schg_update_fru_info(diskmon_t *diskp)
 {
 	if (diskp->initial_configuration ||
-	    update_configuration_from_topo(diskp) == TOPO_SUCCESS) {
+	    update_configuration_from_topo(g_fm_hdl, diskp) == TOPO_SUCCESS) {
 		diskp->initial_configuration = B_FALSE;
 		dm_assert(pthread_mutex_lock(&diskp->fru_mutex) == 0);
 		if (diskp->frup != NULL)

--- a/usr/src/cmd/fm/modules/i86pc/sfx4500-disk/topo_gather.c	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/modules/i86pc/sfx4500-disk/topo_gather.c	Sat Nov 04 01:18:55 2006 -0800
@@ -43,6 +43,7 @@
 #include <config_admin.h>
 #include <sys/fm/protocol.h>
 #include <fm/libtopo.h>
+#include <fm/topo_hc.h>
 
 #include "sata.h"
 #include "sfx4500_props.h"
@@ -114,7 +115,7 @@
 	(void) nvlist_remove(dupfmri, FM_FMRI_HC_PART, DATA_TYPE_STRING);
 
 	thdl = fmd_hdl_topology(hdl, TOPO_VERSION);
-	if (thdl == NULL || topo_fmri_nvl2str(thdl, dupfmri, &buf, &err) != 0) {
+	if (topo_fmri_nvl2str(thdl, dupfmri, &buf, &err) != 0) {
 		nvlist_free(dupfmri);
 		return (NULL);
 	}
@@ -128,8 +129,9 @@
 }
 
 static nvlist_t *
-find_sfx4500_private_pgroup(topo_hdl_t *thp, tnode_t *node)
+find_sfx4500_private_pgroup(tnode_t *node)
 {
+	int err;
 	nvlist_t *list_of_lists, *nvlp, *dupnvlp;
 	nvlist_t *sfx4500_pgrp = NULL;
 	nvpair_t *nvp = NULL;
@@ -144,7 +146,7 @@
 	 * check inside each embedded nvlist to see if it's the pgroup we're
 	 * looking for.
 	 */
-	if ((list_of_lists = topo_prop_get_all(thp, node)) != NULL) {
+	if ((list_of_lists = topo_prop_getprops(node, &err)) != NULL) {
 		/*
 		 * Go through the list of nvlists, looking for the
 		 * property group we need.
@@ -257,9 +259,15 @@
 	*finalstringbuflen = buflen;
 }
 
+typedef struct walk_diskmon {
+	diskmon_t *target;
+	char *pfmri;
+} walk_diskmon_t;
+
 static int
-topo_add_disk(topo_hdl_t *thp, tnode_t *node, diskmon_t *target_diskp)
+topo_add_disk(topo_hdl_t *thp, tnode_t *node, walk_diskmon_t *wdp)
 {
+	diskmon_t *target_diskp = wdp->target;
 	nvlist_t	*fmri = NULL;
 	nvlist_t	*asru_fmri;
 	nvlist_t	*fru_fmri;
@@ -269,53 +277,25 @@
 	char		*serial = NULL;
 	char		*manuf = NULL;
 	char		*model = NULL;
-	char		*cstr = NULL;
 	char		*buf;
 	char		*label;
-	char		*p;
 	uint64_t	ptr = 0;
 	int		buflen;
 	int		err;
-	int		orig_cstr_len;
 	dm_fru_t	*frup;
 	diskmon_t	*diskp;
 
-	/*
-	 * Match this node to a disk in the configuration by looking at
-	 * our parent's fmri (and do that by getting our FMRI and chopping
-	 * off the last part).
-	 */
-	if (topo_node_resource(node, &fmri, &err) != 0) {
-		log_msg(MM_TOPO, "topo_add_disk: Could not generate FMRI for "
-		    "node %p!\n", (void *)node);
-		return (-1);
-	}
-
-	if (topo_fmri_nvl2str(thp, fmri, &cstr, &err) != 0) {
-		log_msg(MM_TOPO, "topo_add_disk: Could not create string for "
-		    "node %p's FMRI!\n", (void *)node);
-		nvlist_free(fmri);
-		return (-1);
-	}
-
-	nvlist_free(fmri);
-
-	/*
-	 * Chop off all but last path (since there's no way to get
-	 * the node's parent in the libtopo API).
-	 */
-	orig_cstr_len = strlen(cstr) + 1;
-	p = strrchr(cstr, '/');
-	dm_assert(p != NULL);
-	*p = 0;
-	if (nvlist_lookup_uint64(g_topo2diskmon, cstr, &ptr) != 0) {
-		log_msg(MM_TOPO, "No diskmon for parent of node %p.\n", node);
-		topo_hdl_free(thp, cstr, orig_cstr_len);
+	dm_assert(wdp->pfmri != NULL);
+	if (nvlist_lookup_uint64(g_topo2diskmon, wdp->pfmri, &ptr) != 0) {
+		log_msg(MM_TOPO, "No diskmon for %s: parent of node %p.\n",
+		    wdp->pfmri, node);
+		dstrfree(wdp->pfmri);
 		/* Skip this disk: */
 		return (0);
 	}
 
-	topo_hdl_free(thp, cstr, orig_cstr_len);
+	dstrfree(wdp->pfmri);
+	wdp->pfmri = NULL;
 
 	diskp = (diskmon_t *)(uintptr_t)ptr;
 
@@ -584,9 +564,10 @@
 
 
 static int
-topo_add_sata_port(topo_hdl_t *thp, tnode_t *node, diskmon_t *target_diskp)
+topo_add_sata_port(topo_hdl_t *thp, tnode_t *node, walk_diskmon_t *wdp)
 {
-	nvlist_t	*nvlp = find_sfx4500_private_pgroup(thp, node);
+	diskmon_t *target_diskp = wdp->target;
+	nvlist_t	*nvlp = find_sfx4500_private_pgroup(node);
 	nvlist_t	*prop_nvlp;
 	nvpair_t	*nvp = NULL;
 	char		*prop_name, *prop_value;
@@ -636,7 +617,7 @@
 			dm_assert(pthread_mutex_unlock(&diskp->fru_mutex) == 0);
 		}
 
-		dstrfree(cstr);
+		wdp->pfmri = cstr;
 		nvlist_free(nvlp);
 		return (0);
 	}
@@ -833,7 +814,7 @@
 				nvlist_free(diskprops);
 		}
 
-		dstrfree(cstr);
+		wdp->pfmri = cstr;
 	}
 
 
@@ -847,60 +828,59 @@
 {
 	char *nodename = topo_node_name(node);
 	if (strcmp(SATA_DISK, nodename) == 0)
-		return (topo_add_disk(thp, node, (diskmon_t *)arg)
+		return (topo_add_disk(thp, node, (walk_diskmon_t *)arg)
 		    ? TOPO_WALK_ERR : TOPO_WALK_NEXT);
 	else if (strcmp(SATA_PORT, nodename) == 0)
-		return (topo_add_sata_port(thp, node, (diskmon_t *)arg)
+		return (topo_add_sata_port(thp, node, (walk_diskmon_t *)arg)
 		    ? TOPO_WALK_ERR : TOPO_WALK_NEXT);
 
 	return (TOPO_WALK_NEXT);
 }
 
 
+/*ARGSUSED*/
 int
-update_configuration_from_topo(diskmon_t *diskp)
+update_configuration_from_topo(fmd_hdl_t *hdl, diskmon_t *diskp)
 {
 	int err;
 	topo_hdl_t *thp;
 	topo_walk_t *twp;
+	walk_diskmon_t wd;
 	char *uuid;
 
 	if ((thp = topo_open(TOPO_VERSION, NULL, &err)) == NULL) {
-
 		return (TOPO_OPEN_ERROR);
 	}
 
 	if ((uuid = topo_snap_hold(thp, NULL, &err)) == NULL) {
-
 		topo_close(thp);
 		return (TOPO_SNAP_ERROR);
 	}
 
-
-	if ((twp = topo_walk_init(thp, FM_FMRI_SCHEME_HC, gather_topo_cfg,
-	    diskp, &err)) == NULL) {
+	topo_hdl_strfree(thp, uuid);
 
-		topo_snap_release(thp);
-		topo_hdl_strfree(thp, uuid);
-		topo_close(thp);
-
+	wd.target = diskp;
+	wd.pfmri = NULL;
+	if ((twp = topo_walk_init(thp, FM_FMRI_SCHEME_HC, gather_topo_cfg,
+	    &wd, &err)) == NULL) {
+		topo_close(thp); /* topo_close() will release the snapshot */
 		return (err ? TOPO_WALK_INIT_ERROR : TOPO_SUCCESS);
 	}
 
-	topo_hdl_strfree(thp, uuid);
-
 	if (topo_walk_step(twp, TOPO_WALK_CHILD) == TOPO_WALK_ERR) {
 
 		topo_walk_fini(twp);
-		topo_snap_release(thp);
+		if (wd.pfmri != NULL)
+			dstrfree(wd.pfmri);
+
 		topo_close(thp);
-
 		return (TOPO_WALK_ERROR);
 	}
 
 	topo_walk_fini(twp);
-	topo_snap_release(thp);
 	topo_close(thp);
+	if (wd.pfmri != NULL)
+		dstrfree(wd.pfmri);
 
 	return (TOPO_SUCCESS);
 }

--- a/usr/src/cmd/fm/modules/i86pc/sfx4500-disk/topo_gather.h	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/modules/i86pc/sfx4500-disk/topo_gather.h	Sat Nov 04 01:18:55 2006 -0800
@@ -44,7 +44,7 @@
 #define	TOPO_SNAP_ERROR		3
 #define	TOPO_OPEN_ERROR		4
 
-int		update_configuration_from_topo(diskmon_t *diskp);
+int		update_configuration_from_topo(fmd_hdl_t *, diskmon_t *diskp);
 int		init_configuration_from_topo(void);
 void		fini_configuration_from_topo(void);
 diskmon_t	*dm_fmri_to_diskmon(fmd_hdl_t *hdl, nvlist_t *fmri);

--- a/usr/src/cmd/fm/schemes/hc/scheme.c	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/schemes/hc/scheme.c	Sat Nov 04 01:18:55 2006 -0800
@@ -25,67 +25,56 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include <fm/topo_mod.h>
+#include <strings.h>
 #include <fm/fmd_fmri.h>
 #include <fm/libtopo.h>
-
-typedef struct hc_walk_arg {
-	void	*p;
-	int	*resultp;
-} hc_walk_arg_t;
-
-static topo_hdl_t	*HC_thp = NULL;
-static char		*HC_uuid = NULL;
+#include <fm/topo_mod.h>
 
 int
 fmd_fmri_init(void)
 {
-	int err;
-
-	if ((HC_thp = topo_open(TOPO_VERSION, NULL, &err)) == NULL)
-		return (-1);
-
 	return (0);
 }
 
 void
 fmd_fmri_fini(void)
 {
-	if (HC_uuid) {
-		topo_snap_release(HC_thp);
-		topo_hdl_strfree(HC_thp, HC_uuid);
-		HC_uuid = NULL;
-	}
-	topo_close(HC_thp);
 }
 
+ssize_t
+fmd_fmri_nvl2str(nvlist_t *nvl, char *buf, size_t buflen)
+{
+	int err;
+	uint8_t version;
+	ssize_t len;
+	topo_hdl_t *thp;
+	char *str;
+
+	if (nvlist_lookup_uint8(nvl, FM_VERSION, &version) != 0 ||
+	    version > FM_HC_SCHEME_VERSION)
+		return (fmd_fmri_set_errno(EINVAL));
+
+	thp = fmd_fmri_topology(TOPO_VERSION);
+	if (topo_fmri_nvl2str(thp, nvl, &str, &err) != 0)
+		return (fmd_fmri_set_errno(EINVAL));
+
+	if (buf != NULL)
+		len = snprintf(buf, buflen, "%s", str);
+	else
+		len = strlen(str);
+
+	topo_hdl_strfree(thp, str);
+
+	return (len);
+}
+
+typedef struct hc_walk_arg {
+	void	*p;
+	int	*resultp;
+} hc_walk_arg_t;
+
 static int
-hc_update_topology(void)
-{
-	static uint64_t lastgen = 0;
-	int err;
-	uint64_t curgen;
-
-	if (HC_uuid == NULL ||
-	    (curgen = fmd_fmri_get_drgen()) > lastgen) {
-
-		lastgen = curgen;
-
-		if (HC_uuid) {
-			topo_snap_release(HC_thp);
-			topo_hdl_strfree(HC_thp, HC_uuid);
-			HC_uuid = NULL;
-		}
-
-		if ((HC_uuid = topo_snap_hold(HC_thp, NULL, &err)) == NULL) {
-			return (-1);
-		}
-	}
-	return (0);
-}
-
-static int
-hc_topo_walk(topo_walk_cb_t fn, void *arg, int *resultp)
+hc_topo_walk(topo_hdl_t *thp, topo_walk_cb_t fn, void *arg, int *resultp)
 {
 	int err, rv;
 	topo_walk_t *twp;
@@ -94,7 +83,7 @@
 	hcarg.p = arg;
 	hcarg.resultp = resultp;
 
-	if ((twp = topo_walk_init(HC_thp, FM_FMRI_SCHEME_HC, fn,
+	if ((twp = topo_walk_init(thp, FM_FMRI_SCHEME_HC, fn,
 	    &hcarg, &err)) == NULL)
 		return (-1);
 
@@ -105,163 +94,21 @@
 	return (rv);
 }
 
-/*
- * buf_append -- Append str to buf (if it's non-NULL).  Place prepend
- * in buf in front of str and append behind it (if they're non-NULL).
- * Continue to update size even if we run out of space to actually
- * stuff characters in the buffer.
- */
-static void
-buf_append(ssize_t *sz, char *buf, size_t buflen, char *str,
-    char *prepend, char *append)
-{
-	ssize_t left;
-
-	if (str == NULL)
-		return;
-
-	if (buflen == 0 || (left = buflen - *sz) < 0)
-		left = 0;
-
-	if (buf != NULL && left != 0)
-		buf += *sz;
-
-	if (prepend == NULL && append == NULL)
-		*sz += snprintf(buf, left, "%s", str);
-	else if (append == NULL)
-		*sz += snprintf(buf, left, "%s%s", prepend, str);
-	else if (prepend == NULL)
-		*sz += snprintf(buf, left, "%s%s", str, append);
-	else
-		*sz += snprintf(buf, left, "%s%s%s", prepend, str, append);
-}
-
-ssize_t
-fmd_fmri_nvl2str(nvlist_t *nvl, char *buf, size_t buflen)
-{
-	nvlist_t **hcprs = NULL;
-	nvlist_t *anvl = NULL;
-	uint8_t version;
-	ssize_t size = 0;
-	uint_t hcnprs;
-	char *achas = NULL;
-	char *adom = NULL;
-	char *aprod = NULL;
-	char *asrvr = NULL;
-	char *ahost = NULL;
-	char *serial = NULL;
-	char *part = NULL;
-	char *root = NULL;
-	char *rev = NULL;
-	int more_auth = 0;
-	int err, i;
-
-	if (nvlist_lookup_uint8(nvl, FM_VERSION, &version) != 0 ||
-	    version > FM_HC_SCHEME_VERSION)
-		return (fmd_fmri_set_errno(EINVAL));
-
-	/* Get authority, if present */
-	err = nvlist_lookup_nvlist(nvl, FM_FMRI_AUTHORITY, &anvl);
-	if (err != 0 && err != ENOENT)
-		return (fmd_fmri_set_errno(err));
-
-	if ((err = nvlist_lookup_string(nvl, FM_FMRI_HC_ROOT, &root)) != 0)
-		return (fmd_fmri_set_errno(EINVAL));
-
-	err = nvlist_lookup_nvlist_array(nvl, FM_FMRI_HC_LIST, &hcprs, &hcnprs);
-	if (err != 0 || hcprs == NULL)
-		return (fmd_fmri_set_errno(EINVAL));
-
-	if (anvl != NULL) {
-		(void) nvlist_lookup_string(anvl,
-		    FM_FMRI_AUTH_PRODUCT, &aprod);
-		(void) nvlist_lookup_string(anvl,
-		    FM_FMRI_AUTH_CHASSIS, &achas);
-		(void) nvlist_lookup_string(anvl,
-		    FM_FMRI_AUTH_DOMAIN, &adom);
-		(void) nvlist_lookup_string(anvl,
-		    FM_FMRI_AUTH_SERVER, &asrvr);
-		(void) nvlist_lookup_string(anvl,
-		    FM_FMRI_AUTH_HOST, &ahost);
-		if (aprod != NULL)
-			more_auth++;
-		if (achas != NULL)
-			more_auth++;
-		if (adom != NULL)
-			more_auth++;
-		if (asrvr != NULL)
-			more_auth++;
-		if (ahost != NULL)
-			more_auth++;
-	}
-
-	(void) nvlist_lookup_string(nvl, FM_FMRI_HC_SERIAL_ID, &serial);
-	(void) nvlist_lookup_string(nvl, FM_FMRI_HC_PART, &part);
-	(void) nvlist_lookup_string(nvl, FM_FMRI_HC_REVISION, &rev);
-
-	/* hc:// */
-	buf_append(&size, buf, buflen, FM_FMRI_SCHEME_HC, NULL, "://");
-
-	/* authority, if any */
-	if (aprod != NULL)
-		buf_append(&size, buf, buflen, aprod, FM_FMRI_AUTH_PRODUCT "=",
-		    --more_auth > 0 ? "," : NULL);
-	if (achas != NULL)
-		buf_append(&size, buf, buflen, achas, FM_FMRI_AUTH_CHASSIS "=",
-		    --more_auth > 0 ? "," : NULL);
-	if (adom != NULL)
-		buf_append(&size, buf, buflen, adom, FM_FMRI_AUTH_DOMAIN "=",
-		    --more_auth > 0 ? "," : NULL);
-	if (asrvr != NULL)
-		buf_append(&size, buf, buflen, asrvr, FM_FMRI_AUTH_SERVER "=",
-		    --more_auth > 0 ? "," : NULL);
-	if (ahost != NULL)
-		buf_append(&size, buf, buflen, ahost, FM_FMRI_AUTH_HOST "=",
-		    NULL);
-
-	/* separating slash */
-	if (serial != NULL || part != NULL || rev != NULL)
-		buf_append(&size, buf, buflen, "/", NULL, NULL);
-
-	/* hardware-id part */
-	buf_append(&size, buf, buflen, serial, ":" FM_FMRI_HC_SERIAL_ID "=",
-	    NULL);
-	buf_append(&size, buf, buflen, part, ":" FM_FMRI_HC_PART "=", NULL);
-	buf_append(&size, buf, buflen, rev, ":" FM_FMRI_HC_REVISION "=", NULL);
-
-	/* separating slash */
-	buf_append(&size, buf, buflen, "/", NULL, NULL);
-
-	/* hc-root */
-	buf_append(&size, buf, buflen, root, NULL, NULL);
-
-	/* all the pairs */
-	for (i = 0; i < hcnprs; i++) {
-		char *nm = NULL;
-		char *id = NULL;
-
-		if (i > 0)
-			buf_append(&size, buf, buflen, "/", NULL, NULL);
-		(void) nvlist_lookup_string(hcprs[i], FM_FMRI_HC_NAME, &nm);
-		(void) nvlist_lookup_string(hcprs[i], FM_FMRI_HC_ID, &id);
-		if (nm == NULL || id == NULL)
-			return (fmd_fmri_set_errno(EINVAL));
-		buf_append(&size, buf, buflen, nm, NULL, "=");
-		buf_append(&size, buf, buflen, id, NULL, NULL);
-	}
-
-	return (size);
-}
-
 /*ARGSUSED*/
 static int
 hc_topo_present(topo_hdl_t *thp, tnode_t *node, void *arg)
 {
 	int cmp, err;
-	nvlist_t *out = NULL;
-	nvlist_t *asru;
+	nvlist_t *out, *asru;
 	hc_walk_arg_t *hcargp = (hc_walk_arg_t *)arg;
 
+	/*
+	 * Only care about sata-ports and disks
+	 */
+	if (strcmp(topo_node_name(node), SATA_PORT) != 0 &&
+	    strcmp(topo_node_name(node), DISK) != 0)
+		return (TOPO_WALK_NEXT);
+
 	if (topo_node_asru(node, &asru, NULL, &err) != 0 ||
 	    asru == NULL) {
 		return (TOPO_WALK_NEXT);
@@ -280,49 +127,80 @@
 	/*
 	 * Yes, so try to execute the topo-present method.
 	 */
-	cmp = topo_method_invoke(node, TOPO_METH_PRESENT,
-	    TOPO_METH_PRESENT_VERSION, (nvlist_t *)hcargp->p, &out, &err);
-
-	if (out)
+	if (topo_method_invoke(node, TOPO_METH_PRESENT,
+	    TOPO_METH_PRESENT_VERSION, (nvlist_t *)hcargp->p, &out, &err)
+	    == 0) {
+		(void) nvlist_lookup_uint32(out, TOPO_METH_PRESENT_RET,
+		    (uint32_t *)hcargp->resultp);
 		nvlist_free(out);
-
-	if (cmp == 1) {
-		*(hcargp->resultp) = 1;
 		return (TOPO_WALK_TERMINATE);
-	} else if (cmp == 0) {
-		*(hcargp->resultp) = 0;
-		return (TOPO_WALK_TERMINATE);
+	} else {
+		return (TOPO_WALK_ERR);
 	}
 
-	return (TOPO_WALK_NEXT);
 }
 
-
 /*
- * fmd_fmri_present() is called by fmadm to determine if a faulty ASRU
- * is still present in the system.  In general we don't expect to get
- * ASRUs in this scheme, so it's unlikely this routine will get called.
- * In case it does, though, we just traverse our libtopo snapshot,
- * looking for a matching ASRU (minus the serial number information),
- * then invoke the "topo_present" method to determine presence.
+ * The SATA disk topology permits an ASRU to be declared as a pseudo-hc
+ * FMRI, something like this:
+ *
+ *	hc:///motherboard=0/hostbridge=0/pcibus=0/pcidev=1/pcifn=0/sata-port=1
+ *		ASRU: hc:///component=sata0/1
+ *		FRU: hc:///component=MB
+ *		Label: sata0/1
+ *
+ * This is a hack to support cfgadm attachment point ASRUs without defining
+ * a new scheme.  As a result, we need to support an is_present function for
+ * something * that begins with hc:///component=.  To do this, we compare the
+ * nvlist provided by the caller against the ASRU property for all possible
+ * topology nodes.
+ *
+ * The SATA phase 2 project will address the lack of a proper FMRI scheme
+ * for cfgadm attachment points.  This code may be removed when the SATA
+ * phase 2 FMA work is completed.
  */
-int
-fmd_fmri_present(nvlist_t *nvl)
+static int
+hc_sata_hack(nvlist_t *nvl)
 {
 	int ispresent = 1;
+	topo_hdl_t *thp;
 
 	/*
 	 * If there's an error during the topology update, punt by
 	 * indicating presence.
 	 */
-	if (hc_update_topology() < 0)
-		return (1);
-
-	(void) hc_topo_walk(hc_topo_present, nvl, &ispresent);
+	thp = fmd_fmri_topology(TOPO_VERSION);
+	(void) hc_topo_walk(thp, hc_topo_present, nvl, &ispresent);
 
 	return (ispresent);
 }
 
+int
+fmd_fmri_present(nvlist_t *nvl)
+{
+	int err, present;
+	topo_hdl_t *thp;
+	nvlist_t **hcprs;
+	char *nm;
+	uint_t hcnprs;
+
+	err = nvlist_lookup_nvlist_array(nvl, FM_FMRI_HC_LIST, &hcprs, &hcnprs);
+	err |= nvlist_lookup_string(hcprs[0], FM_FMRI_HC_NAME, &nm);
+	if (err != 0)
+		return (0);
+
+	if (strcmp(nm, "component") == 0)
+		return (hc_sata_hack(nvl));
+
+	thp = fmd_fmri_topology(TOPO_VERSION);
+	present = topo_fmri_present(thp, nvl, &err);
+
+	if (err != 0)
+		return (present);
+	else
+		return (1);
+}
+
 /*
  * fmd_fmri_unusable() is called by fmadm to determine if a faulty ASRU
  * is usable.  In general we don't expect to get ASRUs in this scheme,

--- a/usr/src/cmd/fm/schemes/mem/mem.c	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/schemes/mem/mem.c	Sat Nov 04 01:18:55 2006 -0800
@@ -348,7 +348,7 @@
 	 * If we have a well-formed unum (hc-FMRI), use the string verbatim
 	 * to form the initial mem:/// components.  Otherwise use unum=%s.
 	 */
-	if (strncmp(rawunum, "hc:///", 6) != 0)
+	if (strncmp(rawunum, "hc://", 5) != 0)
 		prefix = FM_FMRI_MEM_UNUM "=";
 	else
 		prefix = "";
@@ -371,14 +371,18 @@
 	}
 
 	/*
-	 * If we have a well-formed unum (hc-FMRI), leave it as is.
+	 * If we have a well-formed unum (hc-FMRI), we skip over the
+	 * the scheme and authority prefix.
 	 * Otherwise, the spaces and colons will be escaped,
 	 * rendering the resulting FMRI pretty much unreadable.
 	 * We're therefore going to do some escaping of our own first.
 	 */
-	if (strncmp(rawunum, "hc:///", 6) == 0) {
+	if (strncmp(rawunum, "hc://", 5) == 0) {
+		rawunum += 5;
+		rawunum = strchr(rawunum, '/');
+		++rawunum;
 		/* LINTED: variable format specifier */
-		size = snprintf(buf, buflen, format, rawunum + 6, val);
+		size = snprintf(buf, buflen, format, rawunum, val);
 	} else {
 		preunum = fmd_fmri_strdup(rawunum);
 		presz = strlen(preunum) + 1;

--- a/usr/src/cmd/fm/scripts/fmsim.ksh	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/cmd/fm/scripts/fmsim.ksh	Sat Nov 04 01:18:55 2006 -0800
@@ -3,9 +3,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -21,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -76,12 +75,21 @@
 		case $name in
 		_fmd_init)        cp $1 $2/usr/lib/fm/fmd/plugins; return ;;
 		fmd_fmri_nvl2str) cp $1 $2/usr/lib/fm/fmd/schemes; return ;;
-		topo_load)        cp $1 $2/usr/lib/fm/topo; return ;;
+		topo_load)        cp $1 $2/usr/lib/fm/topo/plugins; return ;;
 		esac
 	done
 	die "\nunknown .so type -- $1"
 }
 
+function cp_topo
+{
+	mkdir -p $2/usr/lib/fm/topo/maps
+	cp $1 $2/usr/lib/fm/topo/maps; 
+	for platdir in $2/usr/platform/*/lib/fm/topo/maps; do
+		rm -f $platdir/* 2>/dev/null
+	done
+}
+
 function list_cmds
 {
 	for cmd in fmadm fmdump fmstat; do
@@ -220,14 +228,15 @@
 	fmd.conf) cp $file $simroot/etc/fm/fmd ;;
 	*.conf)	cp $file $simroot/usr/lib/fm/fmd/plugins ;;
 	*.dict)	cp $file $simroot/usr/lib/fm/dict ;;
-	*.eft)	die "\neversholt fault tree file not yet supported -- $file" ;;
+	*.eft) cp $file $simroot/usr/lib/fm/eft ;;
 	*.esc)	die "\neversholt source file not yet supported -- $file" ;;
 	*.inj)	inj_args="$inj_args $file" ;;
 	*.log)	inj_args="$inj_args $file" ;;
 	*log)	inj_args="$inj_args $file" ;;
 	*.mo)	cp $file $simroot/usr/lib/locale/$LANG/LC_MESSAGES ;;
 	*.so)	cp_so $file $simroot ;;
-	*.topo) cp $file $simroot/usr/lib/fm/topo ;;
+	*.topo) die "\n .topo files not supported -- $file" ;;
+	*.xml) cp_topo $file $simroot ;;
 	*)	die "\nunknown file type or suffix -- $file" ;;
 	esac
 	echo " $base\c"
@@ -243,7 +252,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+#ident	"@(#)fmsim.ksh	1.5	06/10/11 SMI"
 
 #
 # fmsim(1M) script generated for $simroot $(date)

--- a/usr/src/lib/fm/topo/Makefile	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/lib/fm/topo/Makefile	Sat Nov 04 01:18:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -25,6 +24,6 @@
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 
-SUBDIRS = libtopo modules files
+SUBDIRS = libtopo modules maps
 
 include ../Makefile.subdirs

--- a/usr/src/lib/fm/topo/Makefile.rootdirs	Fri Nov 03 20:28:35 2006 -0800
+++ b/usr/src/lib/fm/topo/Makefile.rootdirs	Sat Nov 04 01:18:55 2006 -0800
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -35,7 +34,7 @@
 $(ROOT)/usr/lib/fm/topo: $(ROOT)/usr/lib/fm
 	$(INS.dir)
 
-$(ROOT)/usr/lib/fm/topo/%: $(ROOT)/usr/lib/fm/topo
+$(ROOT)/usr/lib/fm/topo/$(MODCLASS): $(ROOT)/usr/lib/fm/topo
 	$(INS.dir)
 
 #
@@ -50,13 +49,3 @@
 
 $(ROOT)/usr/platform/%/lib/fm/topo/$(MODCLASS): $(ROOT)/usr/platform/%/lib/fm/topo
 	$(INS.dir)
-
-#
-# Define the transitive set of rules to create platform.xml install directories
-# within the proto area.  This is used by all Makefile.xml files
-#
-$(ROOT)/usr/platform/%/lib/fm:
-	$(INS.dir)
-
-$(ROOT)/usr/platform/%/lib/fm/topo: $(ROOT)/usr/platform/%/lib/fm
-	$(INS.dir)

--- a/usr/src/lib/fm/topo/files/Makefile	Fri Nov 03 20:28:35 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-
-sparc_SUBDIRS =	sun4u \
-		sun4v \
-		SUNW,Sun-Fire \
-		SUNW,Sun-Fire-T200 \
-		SUNW,Sun-Fire-15000 \
-		SUNW,SPARC-Enterprise \
-		SUNW,Sun-Blade-T6300
-
-i386_SUBDIRS = i86pc
-
-SUBDIRS = $($(MACH)_SUBDIRS)
-
-include ../../Makefile.subdirs

--- a/usr/src/lib/fm/topo/files/Makefile.file	Fri Nov 03 20:28:35 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-
-include ../../../Makefile.lib
-include ../../../../Makefile.lib
-
-DTDSRC = $(DTDFILE:%=../common/%)
-DTDTARG = $(DTDFILE:%=%)
-ROOT_DTDTARG = $(DTDTARG:%=$(ROOT)/usr/share/lib/xml/dtd/%)
-
-TOPOTARG = $(TOPOFILE:%=%)
-common_TOPOTARG = $(ROOT)/usr/lib/fm/topo/$(TOPOTARG)
-arch_TOPOTARG = $(ROOT)/usr/platform/$(ARCH)/lib/fm/topo/$(TOPOTARG)
-platform_TOPOTARG = \
-	$(PLATFORMS:%=$(ROOT)/usr/platform/%/lib/fm/topo/$(TOPOTARG))
-ROOT_TOPOTARG = $($(CLASS)_TOPOTARG)
-
-all: $(ROOT_DTDTARG) $(ROOT_TOPOTARG)
-
-clean:
-	$(RM) $(ROOT_DTDTARG) $(ROOT_TOPOTARG)
-
-clobber: clean
-
-check: $(CHECKHDRS)
-
-install_h lint _msg:
-
-$(ROOT_DTDTARG): $$(@D)
-	$(RM) $@; $(INS) -s -m 0444 -f $(@D) $(DTDSRC)
-
-$(ROOT_TOPOTARG): $$(@D)
-	$(RM) $@; $(INS) -s -m 0444 -f $(@D) $(TOPOTARG)
-
-install: $(ROOT_DTDTARG) $(ROOT_TOPOTARG)
-
-include ../../Makefile.rootdirs
-

--- a/usr/src/lib/fm/topo/files/SUNW,SPARC-Enterprise/Makefile	Fri Nov 03 20:28:35 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-PLATFORMS = SUNW,SPARC-Enterprise
-CLASS = platform
-DTDFILE = 
-TOPOFILE = hc-topology.xml
-SRCDIR = ../SUNW,SPARC-Enterprise
-
-include ../Makefile.file

--- a/usr/src/lib/fm/topo/files/SUNW,SPARC-Enterprise/hc-topology.xml	Fri Nov 03 20:28:35 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE topology SYSTEM "/usr/share/lib/xml/dtd/topology.dtd.1">
-<!--
- Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- Use is subject to license terms.
-
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
-    ident	"%Z%%M%	%I%	%E% SMI"
--->
-
-<topology name='SUNW,SPARC-Enterprise' scheme='hc'>
-  <range name='chassis' min='0' max='0'>
-    <node instance='0'>
-      <propgroup name='protocol'>
-        <propval name='FRU' type='fmri'
-          value='hc:///chassis=0' />
-      </propgroup>
-    </node>
-    <dependents grouping='children'>
-      <range name='ioboard' min='0' max='15'>
-        <enum-method name='ioboard' version='1'
-          path='%r/usr/platform/SUNW,SPARC-Enterprise/lib/fm/topo/plugins' />
-      </range>
-    </dependents>
-  </range>
-</topology>

--- a/usr/src/lib/fm/topo/files/SUNW,Sun-Blade-T6300/Makefile	Fri Nov 03 20:28:35 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-
-PLATFORMS = SUNW,Sun-Blade-T6300
-CLASS = platform
-DTDFILE = 
-TOPOFILE = hc-topology.xml
-SRCDIR = ../SUNW,Sun-Blade-T6300
-
-include ../Makefile.file

--- a/usr/src/lib/fm/topo/files/SUNW,Sun-Blade-T6300/hc-topology.xml	Fri Nov 03 20:28:35 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE topology SYSTEM "/usr/share/lib/xml/dtd/topology.dtd.1">
-<!--
- Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- Use is subject to license terms.
-
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
-    ident	"%Z%%M%	%I%	%E% SMI"
--->
-
-<topology name='SUNW,Sun-Blade-T6300' scheme='hc'>
-  <range name='motherboard' min='0' max='0'>
-    <node instance='0'>
-      <propgroup name='protocol'>
-        <propval name='FRU' type='fmri'
-          value='hc:///motherboard=0' />
-        <propval name='label' type='string'
-          value='MB' />
-      </propgroup>
-    </node>
-    <dependents grouping='children'>
-     <range name='hostbridge' min='0' max='254'>
-       <enum-method name='hostbridge' version='1'
-         path='%r/usr/platform/sun4v/lib/fm/topo/plugins' />
-     </range>
-    </dependents>
-  </range>
-</topology>

--- a/usr/src/lib/fm/topo/files/SUNW,Sun-Fire-15000/Makefile	Fri Nov 03 20:28:35 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-PLATFORMS = SUNW,Sun-Fire-15000
-CLASS = platform
-DTDFILE = 
-TOPOFILE = hc-topology.xml
-SRCDIR = ../SUNW,Sun-Fire-15000
-
-include ../Makefile.file

--- a/usr/src/lib/fm/topo/files/SUNW,Sun-Fire-15000/hc-topology.xml	Fri Nov 03 20:28:35 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE topology SYSTEM "/usr/share/lib/xml/dtd/topology.dtd.1">
-<!--
- Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- Use is subject to license terms.
-
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
-    ident	"%Z%%M%	%I%	%E% SMI"
--->
-
-<topology name='SUNW,Sun-Fire-15000' scheme='hc'>
-  <range name='interconnect' min='0' max='0'>
-    <node instance='0'>
-      <propgroup name='protocol'>
-        <propval name='FRU' type='fmri'
-          value='hc:///interconnect=0' />
-      </propgroup>
-    </node>
-    <dependents grouping='children'>
-      <range name='ioboard' min='0' max='17'>
-        <enum-method name='ioboard' version='1'
-          path='%r/usr/platform/SUNW,Sun-Fire-15000/lib/fm/topo/plugins' />
-      </range>
-      <range name='cpu' min='0' max='100'>
-        <enum-method name='chip' version='1'
-          path='%r/usr/platform/sun4u/lib/fm/topo/plugins' />
-      </range>
-    </dependents>
-  </range>
-</topology>

--- a/usr/src/lib/fm/topo/files/SUNW,Sun-Fire-T200/Makefile	Fri Nov 03 20:28:35 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-PLATFORMS = SUNW,Sun-Fire-T200
-CLASS = platform
-DTDFILE = 
-TOPOFILE = hc-topology.xml
-SRCDIR = ../SUNW,Sun-Fire-T200
-
-include ../Makefile.file

--- a/usr/src/lib/fm/topo/files/SUNW,Sun-Fire-T200/hc-topology.xml	Fri Nov 03 20:28:35 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE topology SYSTEM "/usr/share/lib/xml/dtd/topology.dtd.1">
-<!--
- Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- Use is subject to license terms.
-
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
-    ident	"%Z%%M%	%I%	%E% SMI"
--->
-
-<topology name='SUNW,Sun-Fire-T200' scheme='hc'>
-  <range name='motherboard' min='0' max='0'>
-    <node instance='0'>
-      <propgroup name='protocol'>
-        <propval name='FRU' type='fmri'
-          value='hc:///component=MB' />
-        <propval name='label' type='string'
-          value='MB' />
-      </propgroup>
-    </node>
-    <dependents grouping='children'>
-      <range name='ioboard' min='0' max='0'>
-        <enum-method name='ioboard' version='1'
-          path='%r/usr/platform/sun4v/lib/fm/topo/plugins' />
-      </range>
-    </dependents>
-  </range>
-  <range name='ioboard' min='0' max='0'>
-    <enum-method name='ioboard' version='1'
-      path='%r/usr/platform/sun4v/lib/fm/topo/plugins' />
-  </range>
-</topology>

--- a/usr/src/lib/fm/topo/files/SUNW,Sun-Fire/Makefile	Fri Nov 03 20:28:35 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-PLATFORMS = SUNW,Sun-Fire
-CLASS = platform
-DTDFILE = 
-TOPOFILE = hc-topology.xml
-SRCDIR = ../SUNW,Sun-Fire
-
-include ../Makefile.file

--- a/usr/src/lib/fm/topo/files/SUNW,Sun-Fire/hc-topology.xml	Fri Nov 03 20:28:35 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE topology SYSTEM "/usr/share/lib/xml/dtd/topology.dtd.1">
-<!--
- Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- Use is subject to license terms.
-
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
-    ident	"%Z%%M%	%I%	%E% SMI"
--->
-
-<topology name='SUNW,Sun-Fire' scheme='hc'>
-  <range name='centerplane' min='0' max='0'>
-    <node instance='0'>
-      <propgroup name='protocol'>
-        <propval name='FRU' type='fmri'
-          value='hc:///centerplane=0' />
-      </propgroup>
-    </node>
-    <dependents grouping='children'>
-      <range name='ioboard' min='0' max='9'>
-        <enum-method name='ioboard' version='1'
-          path='%r/usr/platform/SUNW,Sun-Fire/lib/fm/topo/plugins' />
-      </range>
-      <range name='cpu' min='0' max='100'>
-        <enum-method name='chip' version='1'
-          path='%r/usr/platform/sun4u/lib/fm/topo/plugins' />
-      </range>
-    </dependents>
-  </range>
-</topology>

--- a/usr/src/lib/fm/topo/files/common/topology.dtd.1	Fri Nov 03 20:28:35 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- Use is subject to license terms.
-
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License, Version 1.0 only
- (the "License").  You may not use this file except in compliance
- with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
-    ident	"%Z%%M%	%I%	%E% SMI"
--->
-
-<!--
-  Topology description DTD
-
-    Most attributes are string values (or an individual string from a
-    restricted set), but attributes with a specific type requirement are
-    noted in the comment describing the element.
--->
-
-<!--
-  XInclude support
-
-    Topologies may be composed via the xi:include tag.
-    libtopo(3LIB) interfaces enforce that all composed topologies be of the
-    same scheme.
--->
-
-<!ELEMENT xi:include
-	(xi:fallback) >
-
-<!ATTLIST xi:include
-  href CDATA #REQUIRED
-  parse (xml|text) "xml"
-  encoding CDATA #IMPLIED
-  xmlns:xi CDATA #FIXED "http://www.w3.org/2001/XInclude"
-  >
-
-<!ELEMENT xi:fallback
-  ANY
-  >
-<!ATTLIST xi:fallback
-  xmlns:xi CDATA #FIXED "http://www.w3.org/2001/XInclude"
-  >
-
-<!--
-  data-stability
-
-    This element associates an SMI stability level with the parent
-    element's data.  See attributes(5) for an explanation of interface
-    stability levels.
-
-    Its attribute is
-
-	value	The stability level of the parent element's data.
--->
-
-<!ELEMENT data-stability EMPTY>
-
-<!ATTLIST data-stability
-	value		( Standard | Stable | Evolving | Unstable |
-			External | Obsolete ) #REQUIRED >
-
-<!--
-  name-stability
-
-    This element associates an SMI stability level with the parent
-    element's name.  See attributes(5) for an explanation of interface
-    stability levels.
-
-    Its attribute is
-
-	value	The stability level of the parent element's name.
--->
-
-<!ELEMENT name-stability EMPTY>
-
-<!ATTLIST name-stability
-	value		( Standard | Stable | Evolving | Unstable |
-			External | Obsolete ) #REQUIRED >
-
-<!-- Properties and property groups -->
-
-<!--
-   propval
-
-     This element is for a singly valued property within a property
-     group.
-
-     Its attributes are
-
-	name	The name of this property.
-
-	type	The data type for this property.
-
-	value	The value for this property.  Must match type
-		restriction of type attribute.
-
-	immutable This value remains unchanged for the lifetime of a snapshot.
--->
-
-<!ELEMENT propval
-	(name-stability?, data-stability?) >
-
-<!ATTLIST propval
-	name		CDATA #REQUIRED
-	type		( int32 | uint32 | int64 | uint64 |
-			  string | fmri ) #REQUIRED
-	value		CDATA #REQUIRED
-	immutable	( true | false ) "true" >
-
-<!--
-  propgroup
-
-    This element is for a set of related properties on a topo node
-    It contains an optional stability element, as well as
-    zero or more property-containing elements.
-
-    Its attributes are
-
-	name	The name of this property group.
-
--->
-
-<!ELEMENT propgroup
-	( name-stability?, propval* ) >
-
-<!ATTLIST propgroup
-	name		CDATA #REQUIRED>
-
-<!-- Methods -->
-
-<!--
-  argval
-
-    An method argument. It has two attributes:
-
-	name	The name of the argument.
-	type	The data type of the argument.
--->
-
-<!ELEMENT argval EMPTY>
-
-<!ATTLIST argval
-	name		CDATA #REQUIRED
-	type		CDATA #REQUIRED >
-
-<!--
-  enum-method
-
-    This element describes the enumeration method used to
-    populate a composition of topo nodes.  Its interpretation is
-    left to the enumerator to which a particular topo node is
-    assigned.  It contains a set of attributes, context, and an optional
-    stability element for the optional args that can be included.
-
-    Its attributes are
-
-	name	Name of this method.  The method names are
-		usually a defined interface of the enumerator to which a
-		topo instance assigned.
-
-	path	location of enumerator
-
-	version Version of the enumeration API
--->
-
-<!ELEMENT enum-method
-	( apply-method* ) >
-
-<!ATTLIST enum-method
-	name		CDATA #REQUIRED
-	path		CDATA #REQUIRED
-	version		CDATA #REQUIRED >
-
-<!--
-  apply-method
-
-    This element describes one of the methods used by an enumerator
-    to act populate a composition of topo nodes.  Its interpretation is
-    left to the enumerator to which a particular topo node is
-    assigned.  It contains a set of attributes, context, and an optional
-    stability element for the optional args that can be included.
-
-    Its attributes are
-
-	name	Name of this method.  The method names are
-		usually a defined interface of the enumerator to which a
-		topo instance assigned.
-
-	version Version of the function API
-
-	description English description of the method
--->
-
-<!ELEMENT apply-method
-	( name-stability?, argval* ) >
-
-<!ATTLIST apply-method
-	name		CDATA #REQUIRED
-	version		CDATA #REQUIRED
-	description	CDATA #REQUIRED >
-
-<!--
-  node
-
-    This element identifies a known topology node.
-
-    Its attributes are
-
-	name	The name of the topo node
-
-	instance The instance number of the known node
-
--->
-
-<!ELEMENT node
-	( propgroup*, dependents* ) >
-
-<!ATTLIST node
-	instance	CDATA #REQUIRED >
-
-<!--
-  dependents
-
-	Ranges may have a number of "dependent" ranges, linked to
-	the original range hierarchically as children or siblings. 
-
-	Its attribute is:
-		grouping	"children", "siblings"
--->
-
-<!ELEMENT dependents 
-	( range | xi:include )+ >
-
-<!ATTLIST dependents 
-	grouping ( children | siblings ) #REQUIRED >
-
-<!--
-  range
-
-    This element identifies a range of possible topology nodes.
-
-    Its attributes are
-
-	name	The common name of all the possible topo nodes
-
-	min	The smallest allowed instance number for an
-		actual topo node.
-
-	max	The largest allowed instance number for an
-		actual topo node.
-
--->
-
-<!ELEMENT range
-	( enum-method?, node*, propgroup*, dependents* ) >
-
-<!ATTLIST range
-	name		CDATA #REQUIRED
-	min		CDATA #REQUIRED
-	max		CDATA #REQUIRED >
-
-<!--
-  topology
-
-	This is the root-level for the scheme-specific topology
-
-	Its attributes are:
-		name	topology name
-		scheme  "hc", "dev"
--->
-
-<!ELEMENT topology
-	(range* | xi:include*)>
-
-<!ATTLIST topology
-	name	CDATA #REQUIRED
-	scheme (hc | dev) #REQUIRED >