From 39881d319dfc3e206354a7fd3a985bed700283df Mon Sep 17 00:00:00 2001
From: Doug Gilbert <dgilbert@us.ibm.com>
Date: Tue, 12 Aug 2014 11:47:09 -0500
Subject: Allow systems with multiple fabric nodes per drawer to use alt-master

Change-Id: I3f5b7844a45c6fda3e818229731220433084fa01
RTC: 113650
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12767
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
---
 src/usr/runtime/populate_attributes.C | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/usr')

diff --git a/src/usr/runtime/populate_attributes.C b/src/usr/runtime/populate_attributes.C
index fb9f23cd7..5bae9fa77 100644
--- a/src/usr/runtime/populate_attributes.C
+++ b/src/usr/runtime/populate_attributes.C
@@ -37,6 +37,7 @@
 #include <targeting/common/target.H>
 #include <targeting/common/targetservice.H>
 #include <targeting/common/utilFilter.H>
+#include <targeting/common/entitypath.H>
 #include <runtime/runtime_reasoncodes.H>
 #include <runtime/runtime.H>
 #include "common/hsvc_attribute_structs.H"
@@ -694,7 +695,14 @@ errlHndl_t populate_attributes( void )
         // Figure out which node we are running on
         TARGETING::Target* mproc = NULL;
         TARGETING::targetService().masterProcChipTargetHandle(mproc);
-        uint64_t nodeid = mproc->getAttr<TARGETING::ATTR_FABRIC_NODE_ID>();
+
+        TARGETING::EntityPath epath =
+            mproc->getAttr<TARGETING::ATTR_PHYS_PATH>();
+
+        const TARGETING::EntityPath::PathElement pe =
+            epath.pathElementOfType(TARGETING::TYPE_NODE);
+
+        uint64_t nodeid = pe.instance;
 
         // ATTR_HB_EXISTING_IMAGE only gets set on a multi-drawer system.
         // Currently set up in host_sys_fab_iovalid_processing() which only
-- 
cgit v1.2.3