Print this page
4018 mpt_sas: allow physical topology enumeration in libtopo
4019 mpt_sas: expose LED controls to libtopo
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Albert Lee <trisk@nexenta.com>
*** 19,28 ****
--- 19,29 ----
* CDDL HEADER END
*/
/*
* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
*/
#include <libxml/parser.h>
#include <libxml/xinclude.h>
#include <sys/fm/protocol.h>
*** 1374,1393 ****
if (xmlStrcmp(cn->name, (xmlChar *)"fac-enum") != 0)
continue;
if ((fprov = xmlGetProp(cn, (xmlChar *)Provider)) == NULL)
goto fenumdone;
-
- if (xmlStrcmp(fprov, (xmlChar *)"fac_prov_ipmi") != 0) {
- topo_dprintf(mp->tm_hdl, TOPO_DBG_XML,
- "Invalid provider specified: %s\n", fprov);
- goto fenumdone;
- }
-
/*
! * Invoke enum entry point in fac provider which will cause the
! * facility enumeration node method to be registered.
*/
if (fac_enum_run(mp, ptn, (const char *)fprov) != 0) {
topo_dprintf(mp->tm_hdl, TOPO_DBG_ERR,
"fac_enum_process: enum entry point failed!\n");
goto fenumdone;
--- 1375,1388 ----
if (xmlStrcmp(cn->name, (xmlChar *)"fac-enum") != 0)
continue;
if ((fprov = xmlGetProp(cn, (xmlChar *)Provider)) == NULL)
goto fenumdone;
/*
! * Invoke enum entry point in facility provider which will
! * cause the facility enumeration node method to be
! * registered.
*/
if (fac_enum_run(mp, ptn, (const char *)fprov) != 0) {
topo_dprintf(mp->tm_hdl, TOPO_DBG_ERR,
"fac_enum_process: enum entry point failed!\n");
goto fenumdone;
*** 1438,1453 ****
if (xmlStrcmp(ftype, (xmlChar *)Sensor) != 0 &&
xmlStrcmp(ftype, (xmlChar *)Indicator) != 0)
goto facdone;
- if (xmlStrcmp(provider, (xmlChar *)"fac_prov_ipmi") != 0) {
- topo_dprintf(mp->tm_hdl, TOPO_DBG_XML, "fac_process: "
- "Invalid provider attr value: %s\n", provider);
- goto facdone;
- }
-
if ((ntn = topo_node_facbind(mp, ptn, (char *)fname,
(char *)ftype)) == NULL)
goto facdone;
pgi.tpi_name = TOPO_PGROUP_FACILITY;
--- 1433,1442 ----
*** 1461,1472 ****
topo_strerror(err));
return (-1);
}
}
/*
! * Invoke enum entry point in fac_prov_ipmi module, which will
! * cause the provider methods to be registered on this node
*/
if (fac_enum_run(mp, ntn, (const char *)provider) != 0) {
topo_dprintf(mp->tm_hdl, TOPO_DBG_ERR, "fac_process: "
"enum entry point failed for provider %s!\n",
provider);
--- 1450,1462 ----
topo_strerror(err));
return (-1);
}
}
/*
! * Invoke enum entry point in the facility provider module,
! * which will cause the provider methods to be registered on
! * this node
*/
if (fac_enum_run(mp, ntn, (const char *)provider) != 0) {
topo_dprintf(mp->tm_hdl, TOPO_DBG_ERR, "fac_process: "
"enum entry point failed for provider %s!\n",
provider);