diff options
| author | Tom Pothier <Tom.Pothier@Sun.COM> | 2010-08-05 08:19:42 -0400 |
|---|---|---|
| committer | Tom Pothier <Tom.Pothier@Sun.COM> | 2010-08-05 08:19:42 -0400 |
| commit | a98ca9da1bd21dd8b5b0161eb59d550bf26e70e2 (patch) | |
| tree | d139897ba4db2960cf843b33382d1cd7dd1aad8d /usr/src/lib/fm | |
| parent | 41f7470a4f7ae77ab9654d259b22ed23840d0f38 (diff) | |
| download | illumos-joyent-a98ca9da1bd21dd8b5b0161eb59d550bf26e70e2.tar.gz | |
6972333 fans and psu are not part of the chassis topology
Diffstat (limited to 'usr/src/lib/fm')
| -rw-r--r-- | usr/src/lib/fm/topo/modules/i86pc/x86pi/x86pi.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/usr/src/lib/fm/topo/modules/i86pc/x86pi/x86pi.c b/usr/src/lib/fm/topo/modules/i86pc/x86pi/x86pi.c index a3b537587d..2e78a755fe 100644 --- a/usr/src/lib/fm/topo/modules/i86pc/x86pi/x86pi.c +++ b/usr/src/lib/fm/topo/modules/i86pc/x86pi/x86pi.c @@ -51,6 +51,13 @@ static int x86pi_enum_gentopo(topo_mod_t *, tnode_t *); static topo_enum_f x86pi_enum; /* libtopo enumeration entry point */ /* + * Top level chassis node in a multiple chassis system; or the chassis + * node in a single chassis system. + */ +static tnode_t *motherchassis_node = NULL; + + +/* * Declare the operations vector and information structure used during * module registration */ @@ -208,11 +215,11 @@ x86pi_enum_start(topo_mod_t *mod, x86pi_enum_t *x86pi) x86pi->mod = mod; if (fac_done == 0) { - (void) topo_mod_enummap(mod, x86pi->t_parent, "chassis", + (void) topo_mod_enummap(mod, motherchassis_node, "chassis", FM_FMRI_SCHEME_HC); - (void) topo_mod_enummap(mod, x86pi->t_parent, "fan", + (void) topo_mod_enummap(mod, motherchassis_node, "fan", FM_FMRI_SCHEME_HC); - (void) topo_mod_enummap(mod, x86pi->t_parent, "psu", + (void) topo_mod_enummap(mod, motherchassis_node, "psu", FM_FMRI_SCHEME_HC); } @@ -246,7 +253,6 @@ x86pi_enum_gentopo(topo_mod_t *mod, tnode_t *t_parent) tnode_t *chassis_node = NULL; tnode_t *basebd_node = NULL; smbs_cnt_t *smbc; - tnode_t *motherchassis_node = NULL; tnode_t *pnode = NULL; id_t psmbid; int notvisited; |