MRU Callout Support Updates

Change-Id: If0e517a72c428b2cd5902900f13f6a3c17a68963 RTC:68487 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4813 Tested-by: Jenkins Server Reviewed-by: Brian H. Horton <brianh@linux.ibm.com> Reviewed-by: Van H. Lee <vanlee@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
author: Richard J. Knight <rjknight@us.ibm.com> 2013-05-08 11:39:38 -0500
committer: A. Patrick Williams III <iawillia@us.ibm.com> 2013-06-14 11:19:22 -0500
commit: dcfcbcdea8737802ff615efde01545d6d6137b9f (patch)
tree: f4b3e96b83ec090c8f48779c18c03f077e638e00
parent: 0f4bb93bb0255db58725cac3979c58784d2563f3 (diff)
download: talos-hostboot-dcfcbcdea8737802ff615efde01545d6d6137b9f.tar.gz
talos-hostboot-dcfcbcdea8737802ff615efde01545d6d6137b9f.zip
15 files changed, 830 insertions, 527 deletions
diff --git a/src/include/usr/hwpf/fapi/fapiTarget.H b/src/include/usr/hwpf/fapi/fapiTarget.H
index 0437691b3..47f0ff8f9 100644
--- a/src/include/usr/hwpf/fapi/fapiTarget.H
+++ b/src/include/usr/hwpf/fapi/fapiTarget.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,2012              */
+/* COPYRIGHT International Business Machines Corp. 2011,2013              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -65,6 +65,7 @@ enum TargetType
     TARGET_TYPE_MCS_CHIPLET   = 0x00000040,
     TARGET_TYPE_XBUS_ENDPOINT = 0x00000080,
     TARGET_TYPE_ABUS_ENDPOINT = 0x00000100,
+    TARGET_TYPE_L4            = 0x00000200,
 };
 
 /**
diff --git a/src/usr/errl/test/errltest.H b/src/usr/errl/test/errltest.H
index 5a8b1f769..9193e32f9 100644
--- a/src/usr/errl/test/errltest.H
+++ b/src/usr/errl/test/errltest.H
@@ -506,13 +506,13 @@ public:
                     TARGETING::targetService().end(),
                     &procChipFilter);
 
-            // find a membuf target
-            TARGETING::PredicateCTM membufChipFilter(
-                    TARGETING::CLASS_CHIP,TARGETING::TYPE_MEMBUF);
-            TARGETING::TargetRangeFilter pMembuf(
+            TARGETING::PredicateCTM l_L4s(TARGETING::CLASS_UNIT,
+                                          TARGETING::TYPE_L4);
+
+            TARGETING::TargetRangeFilter pL4(
                     TARGETING::targetService().begin(),
                     TARGETING::targetService().end(),
-                    &membufChipFilter);
+                    &l_L4s);
 
             // Create an error log
             errlHndl_t errl = new ERRORLOG::ErrlEntry(
@@ -520,22 +520,26 @@ public:
                                     ERRL_TEST_MOD_ID,
                                     ERRL_TEST_REASON_CODE);
 
+            printk("\n\nelog = 0x%X\n\n", errl->eid() );
+
             // test the different callout types
             TS_TRACE( "test callout pProc %p", *pProc);
             ERRORLOG::ErrlUserDetailsTarget(*pProc).addToLog(errl);
 
-            errl->addHwCallout(*pMembuf,
-                    HWAS::SRCI_PRIORITY_MED,
+            errl->addHwCallout(*pL4,
+                    HWAS::SRCI_PRIORITY_HIGH,
                     HWAS::DECONFIG,
                     HWAS::GARD_NULL);
 
-            errl->addHwCallout(TARGETING::MASTER_PROCESSOR_CHIP_TARGET_SENTINEL,
+            // make this one high too - should end up with B120 src
+            // as the first high priority callout is mem subsys
+            errl->addHwCallout( *pProc,
                     HWAS::SRCI_PRIORITY_HIGH,
                     HWAS::DECONFIG,
                     HWAS::GARD_NULL);
 
             errl->addProcedureCallout(
-                    HWAS::EPUB_PRC_MEMORY_PLUGGING_ERROR,
+                    HWAS::EPUB_PRC_HB_CODE,
                     HWAS::SRCI_PRIORITY_HIGH);
 
             errlCommit(errl, CXXTEST_COMP_ID);
diff --git a/src/usr/hwpf/fapi/fapiTarget.C b/src/usr/hwpf/fapi/fapiTarget.C
index 9546f3d23..e1b901e61 100644
--- a/src/usr/hwpf/fapi/fapiTarget.C
+++ b/src/usr/hwpf/fapi/fapiTarget.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,2012              */
+/* COPYRIGHT International Business Machines Corp. 2011,2013              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -148,7 +148,8 @@ bool Target::isChiplet() const
                         TARGET_TYPE_MBA_CHIPLET |
                         TARGET_TYPE_MCS_CHIPLET |
                         TARGET_TYPE_XBUS_ENDPOINT |
-                        TARGET_TYPE_ABUS_ENDPOINT)) != 0);
+                        TARGET_TYPE_ABUS_ENDPOINT |
+                        TARGET_TYPE_L4 )) != 0);
 }
 
 //******************************************************************************
diff --git a/src/usr/hwpf/hwp/common_attributes.xml b/src/usr/hwpf/hwp/common_attributes.xml
index 18988dda7..5db363d36 100644
--- a/src/usr/hwpf/hwp/common_attributes.xml
+++ b/src/usr/hwpf/hwp/common_attributes.xml
@@ -34,7 +34,7 @@
         TARGET_TYPE_DIMM, TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP,
         TARGET_TYPE_EX_CHIPLET, TARGET_TYPE_MBA_CHIPLET,
         TARGET_TYPE_MCS_CHIPLET, TARGET_TYPE_XBUS_ENDPOINT,
-        TARGET_TYPE_ABUS_ENDPOINT
+        TARGET_TYPE_ABUS_ENDPOINT, TARGET_TYPE_L4
     </targetType>
     <description>
         1 if the target is functional, else 0
diff --git a/src/usr/hwpf/hwp/dmi_training/dmi_training.C b/src/usr/hwpf/hwp/dmi_training/dmi_training.C
index fa78b63d7..14d2133c4 100644
--- a/src/usr/hwpf/hwp/dmi_training/dmi_training.C
+++ b/src/usr/hwpf/hwp/dmi_training/dmi_training.C
@@ -265,11 +265,31 @@ void*    call_mss_getecid( void *io_pArgs )
                     l_cache_enable);
                 l_cache_enable = fapi::ENUM_ATTR_MSS_CACHE_ENABLE_OFF;
 
-                // TODO RTC 68487. Get the child L4 Target and deconfigure it
+                TargetHandleList l_list;
+                getChildChiplets(l_list,
+                                 l_pCentaur,
+                                 TYPE_L4, false );
+
+                TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
+                        "deconfigure %d -  L4s assocated with this centaur "
+                        "huid = 0x%.8X", l_list.size(), get_huid(l_pCentaur));
+
+                for (TargetHandleList::const_iterator
+                        l_l4_iter = l_list.begin();
+                        l_l4_iter != l_list.end();
+                        ++l_l4_iter)
+                {
+                        TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
+                                "deconfigure L4 0x%.8X", get_huid( *l_l4_iter));
+
+                    // call HWAS to deconfigure
+                    l_err = HWAS::theDeconfigGard().
+                                        deconfigureTarget( **l_l4_iter , 0);
+                }
             }
 
             l_pCentaur->setAttr<TARGETING::ATTR_MSS_CACHE_ENABLE>(
-                l_cache_enable);
+                                                                l_cache_enable);
         }
 
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
diff --git a/src/usr/hwpf/plat/fapiPlatAttrOverrideSync.C b/src/usr/hwpf/plat/fapiPlatAttrOverrideSync.C
index 98a59e2e7..05b67d0ba 100644
--- a/src/usr/hwpf/plat/fapiPlatAttrOverrideSync.C
+++ b/src/usr/hwpf/plat/fapiPlatAttrOverrideSync.C
@@ -109,6 +109,9 @@ void directOverride()
             case fapi::TARGET_TYPE_ABUS_ENDPOINT:
                 l_targetType = TARGETING::TYPE_ABUS;
                 break;
+            case fapi::TARGET_TYPE_L4:
+                l_targetType = TARGETING::TYPE_L4;
+                break;
         }
 
         FAPI_IMP(
diff --git a/src/usr/hwpf/test/fapiTargetTest.C b/src/usr/hwpf/test/fapiTargetTest.C
index 92842c5b3..fe4db1904 100644
--- a/src/usr/hwpf/test/fapiTargetTest.C
+++ b/src/usr/hwpf/test/fapiTargetTest.C
@@ -1,25 +1,25 @@
-//  IBM_PROLOG_BEGIN_TAG
-//  This is an automatically generated prolog.
-//
-//  $Source: src/usr/hwpf/test/fapiTargetTest.C $
-//
-//  IBM CONFIDENTIAL
-//
-//  COPYRIGHT International Business Machines Corp. 2011
-//
-//  p1
-//
-//  Object Code Only (OCO) source materials
-//  Licensed Internal Code Source Materials
-//  IBM HostBoot Licensed Internal Code
-//
-//  The source code for this program is not published or other-
-//  wise divested of its trade secrets, irrespective of what has
-//  been deposited with the U.S. Copyright Office.
-//
-//  Origin: 30
-//
-//  IBM_PROLOG_END
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/hwpf/test/fapiTargetTest.C $                          */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2011,2013              */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
 /**
  *  @file fapitargetTest.C
  *
@@ -338,5 +338,85 @@ uint32_t targetTest6()
 
     return l_result;
 }
+//******************************************************************************
+// targetTest7
+//******************************************************************************
+uint32_t targetTest7()
+{
+    uint32_t l_result = 0;
+    uint8_t l_handle = 7;
+    void * l_pHandle = reinterpret_cast<void *>(&l_handle);
+
+    // Create Target
+    Target l_target(TARGET_TYPE_L4, l_pHandle);
+
+    // Ensure that the handle pointer is as expected
+    void * l_pHandleCheck = l_target.get();
+
+    if (l_pHandleCheck != l_pHandle)
+    {
+        FAPI_ERR("targetTest7. Handle is not as expected");
+        l_result = 1;
+    }
+    else
+    {
+        // Ensure that the type is TARGET_TYPE_L4
+        TargetType l_type = l_target.getType();
+
+        if (l_type != TARGET_TYPE_L4)
+        {
+            FAPI_ERR("targetTest7. Type is 0x%x, expected L4", l_type);
+            l_result = 2;
+        }
+        else
+        {
+            FAPI_INF("targetTest7. Success!");
+        }
+    }
+
+    // Set the handle pointer to NULL to prevent any problem on destruction
+    l_target.set(NULL);
+
+    return l_result;
+}
+//******************************************************************************
+// targetTest8
+//******************************************************************************
+uint32_t targetTest8()
+{
+    uint32_t l_result = 0;
+    uint8_t l_handle = 7;
+    void * l_pHandle = reinterpret_cast<void *>(&l_handle);
+
+    // Create Target
+    Target l_target(TARGET_TYPE_L4, l_pHandle);
+
+    // an L4 Target is not a chip
+    if ( l_target.isChip() )
+    {
+        FAPI_ERR("targetTest8. L4 target incorrectly"
+                                " identified itself as a chip");
+        l_result = 1;
+    }
+    else
+    {
+
+        if ( !l_target.isChiplet() )
+        {
+            FAPI_ERR("targetTest8. L4 target failed to identify as a chiplett" );
+            l_result = 2;
+        }
+        else
+        {
+            FAPI_INF("targetTest8. Success!");
+        }
+    }
+
+    // Set the handle pointer to NULL to prevent any problem on destruction
+    l_target.set(NULL);
+
+    return l_result;
+}
+
 
 }
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index a04dbf454..f544b8c14 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -1024,7 +1024,7 @@ for (my $do_core = 0, my $i = 0; $i <= $#STargets; $i++)
     }
 }
 
-# Fifth, generate the Centaur, MBS, and MBA
+# Fifth, generate the Centaur, L4, and MBA
 
 my $memb;
 my $membMcs;
@@ -2368,24 +2368,24 @@ sub generate_centaur
 
     $uidstr = sprintf("0x%02X0C%04X",${node},$mcs+$proc*8+${node}*8*8);
     print "
-<!-- $SYSNAME Centaur MBS affiliated with membuf$ctaur -->
+<!-- $SYSNAME Centaur L4 affiliated with membuf$ctaur -->
 
 <targetInstance>
-    <id>sys${sys}node${node}membuf${ctaur}mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys${sys}node${node}membuf${ctaur}l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>${uidstr}</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-$sys/node-$node/membuf-$ctaur/mbs-0</default>
+        <default>physical:sys-$sys/node-$node/membuf-$ctaur/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-$sys/node-$node/proc-$proc/mcs-$mcs/"
-            . "membuf-$ctaur/mbs-0</default>
+            . "membuf-$ctaur/l4-0</default>
     </attribute>";
 
-    # call to do any fsp per-centaur_mbs attributes
-    do_plugin('fsp_centaur_mbs', $ctaur, $ordinalId );
+    # call to do any fsp per-centaur_l4 attributes
+    do_plugin('fsp_centaur_l4', $ctaur, $ordinalId );
 
     print "
 </targetInstance>
diff --git a/src/usr/targeting/common/test/testcommontargeting.H b/src/usr/targeting/common/test/testcommontargeting.H
index 2bb649c12..6b467159c 100644
--- a/src/usr/targeting/common/test/testcommontargeting.H
+++ b/src/usr/targeting/common/test/testcommontargeting.H
@@ -433,6 +433,8 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
      */
     void testTargetClass(void)
     {
+
+
         TARG_TS_TRACE(ENTER_MRK "testTargetClass" );
 
         using namespace TARGETING;
@@ -540,6 +542,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
 
     void testPredicateHwas()
     {
+
         TARG_TS_TRACE(ENTER_MRK "testPredicateHwas" );
 
         do {
@@ -767,6 +770,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
 
     void testPredicateCtm()
     {
+
         TARG_TS_TRACE(ENTER_MRK "testPredicateCtm" );
 
         using namespace TARGETING;
@@ -862,6 +866,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
 
     void testPredicatePostfixExpr()
     {
+
         TARG_TS_TRACE(ENTER_MRK "testPredicatePostfixExpr" );
 
         using namespace TARGETING;
@@ -1100,6 +1105,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
 
     void testRangeFilter(void)
     {
+
         TARG_TS_TRACE(ENTER_MRK "testRangeFilters" );
 
         using namespace TARGETING;
@@ -1190,6 +1196,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
 
     void testComplexFilter(void)
     {
+
         TARG_TS_TRACE(ENTER_MRK "testComplexFilter" );
 
         using namespace TARGETING;
@@ -1271,6 +1278,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
 
     void testFapiToHbMacros ()
     {
+
         TARG_TS_TRACE(ENTER_MRK "testFapiToHbMacros" );
 
         TARG_TS_TRACE(INF_MRK "Now using direct access macros");
@@ -1397,6 +1405,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
 
     void testFapiAttributes ()
     {
+
         TARG_TS_TRACE(ENTER_MRK "testFapiAttributes" );
 
         using namespace TARGETING;
@@ -1545,6 +1554,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
 
     void testCentaurs()
     {
+
         TARG_TS_TRACE(ENTER_MRK "testCentaurs" );
 
         using namespace TARGETING;
@@ -1588,12 +1598,12 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
 
         TARG_TS_TRACE(EXIT_MRK "testCentaurs" );
     }
-
     /**
      *  @test Tests string attributes
      */
     void testStringAttributes(void)
     {
+
         TARG_TS_TRACE(ENTER_MRK "testStringAttributes" );
 
         using namespace TARGETING;
@@ -1832,6 +1842,179 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         TARG_TS_TRACE(EXIT_MRK "testStringAttributes" );
     }
 
+    void testL4s()
+    {
+        TARG_TS_TRACE(ENTER_MRK "testL4s" );
+
+        using namespace TARGETING;
+
+        PredicateCTM l_procChip(CLASS_CHIP,TYPE_PROC,MODEL_MURANO);
+        TargetRangeFilter l_filter(
+            targetService().begin(),
+            targetService().end(),
+            &l_procChip);
+
+        PredicateCTM l_L4s(CLASS_UNIT,TYPE_L4);
+        uint32_t l_count = 0;
+        uint32_t l_procs = 0;
+
+        // There should be 16 L4s as children of the
+        // 16 processors
+        for(;l_filter;++l_filter)
+        {
+            l_procs++;
+
+            TargetHandleList l_list;
+            (void) targetService().getAssociated(
+                l_list,
+                *l_filter,
+                TARGETING::TargetService::CHILD_BY_AFFINITY,
+                TARGETING::TargetService::ALL,
+                &l_L4s);
+            l_count += l_list.size();
+        }
+
+        // 4 processors -- 4 L4 units per processor
+        uint32_t  total = 4 * l_procs;
+
+        if(l_procs)
+        {
+            if( l_count != total )
+            {
+                TARG_TS_FAIL("Did not find any L4 targets identified "
+                              "with child affinity to the processors");
+            }
+            else
+            {
+                TARG_TS_TRACE("Found %d L4 targets with child affinity to "
+                               "the processors", l_count);
+            }
+        }
+
+        l_count = 0;
+
+        PredicateCTM l_mcsChip(CLASS_UNIT,TYPE_MCS,MODEL_MURANO);
+        TargetRangeFilter l_filter2(
+            targetService().begin(),
+            targetService().end(),
+           &l_mcsChip);
+
+        uint32_t l_MCS = 0;
+
+        // L4 is also a child of the MCS
+        for(;l_filter2;++l_filter2)
+        {
+            l_MCS++;
+
+            TargetHandleList l_list;
+            (void) targetService().getAssociated(
+                l_list,
+                *l_filter2,
+                TARGETING::TargetService::CHILD_BY_AFFINITY,
+                TARGETING::TargetService::ALL,
+                &l_L4s);
+            l_count += l_list.size();
+        }
+
+        // 1  L4 uint per MCS uint
+        total = l_MCS;
+
+        if(l_MCS)
+        {
+            if(l_count != total )
+            {
+                TARG_TS_FAIL("Did not find any L4 targets connected to MCS");
+            }
+            else
+            {
+                TARG_TS_TRACE("Found %d L4 targets connected to MCS",l_count);
+            }
+        }
+
+        PredicateCTM l_nodes(CLASS_ENC,TYPE_NODE,MODEL_POWER8);
+        TargetRangeFilter l_filter3(
+            targetService().begin(),
+            targetService().end(),
+            &l_nodes);
+
+        uint32_t l_node = 0;
+        l_count = 0;
+        // L4 is also a child of the NODE
+        for(;l_filter3;++l_filter3)
+        {
+            l_node++;
+
+            TargetHandleList l_list;
+            (void) targetService().getAssociated(
+                l_list,
+                *l_filter3,
+                TARGETING::TargetService::CHILD_BY_AFFINITY,
+                TARGETING::TargetService::ALL,
+                &l_L4s);
+            l_count += l_list.size();
+        }
+
+        // 1 L4 per MCS * number of nodes
+        total = l_node * l_MCS;
+
+        if(l_node)
+        {
+            if(l_count != total )
+            {
+                TARG_TS_FAIL("Did not find any L4 targets "
+                             "with child affinity to the node");
+            }
+            else
+            {
+                TARG_TS_TRACE("Found %d L4 targets with child "
+                              "affinity to the node",l_count);
+            }
+        }
+
+        PredicateCTM l_membufs(CLASS_CHIP,TYPE_MEMBUF,MODEL_CENTAUR);
+        TargetRangeFilter l_filter4(
+            targetService().begin(),
+            targetService().end(),
+            &l_membufs);
+
+        int l_membuf = 0;
+        l_count = 0;
+        // L4 is also a child of the NODE
+        for(;l_filter4;++l_filter4)
+        {
+            l_membuf++;
+
+            TargetHandleList l_list;
+            (void) targetService().getAssociated(
+                l_list,
+                *l_filter4,
+                TARGETING::TargetService::CHILD_BY_AFFINITY,
+                TARGETING::TargetService::ALL,
+                &l_L4s);
+            l_count += l_list.size();
+        }
+
+        // 1 L4 per membuf
+        total = l_membuf;
+
+        if(l_membuf)
+        {
+            if(l_count != total )
+            {
+                TARG_TS_TRACE("\n\nDid not find any L4 targets "
+                             "with child affinity to the membuf target\n\n");
+            }
+            else
+            {
+                TARG_TS_TRACE("\n\nFound %d L4 targets with child "
+                              "affinity to the membuf\n\n",l_count);
+            }
+        }
+
+        TARG_TS_TRACE(EXIT_MRK "testL4s" );
+    }
+
+
 };
 
 #endif // __TARGETING_COMMON_TESTCOMMONTARGETING_H
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
index 41214b8e5..96f0dfdb8 100644
--- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
@@ -3069,19 +3069,19 @@
     <attribute><id>VPD_REC_NUM</id><default>4</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf4 -->
+<!-- Centaur L4 affiliated with membuf4 -->
 
 <targetInstance>
-    <id>sys0node0membuf4mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf4l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0004</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-4/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-4/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -3167,19 +3167,19 @@
     <attribute><id>VPD_REC_NUM</id><default>5</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf5 -->
+<!-- Centaur L4 affiliated with membuf5 -->
 
 <targetInstance>
-    <id>sys0node0membuf5mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf5l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0005</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-5/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-5/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -3265,19 +3265,19 @@
     <attribute><id>VPD_REC_NUM</id><default>6</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf6 -->
+<!-- Centaur L4 affiliated with membuf6 -->
 
 <targetInstance>
-    <id>sys0node0membuf6mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf6l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0006</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-6/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-6/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-6/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-6/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -3363,19 +3363,19 @@
     <attribute><id>VPD_REC_NUM</id><default>7</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf7 -->
+<!-- Centaur L4 affiliated with membuf7 -->
 
 <targetInstance>
-    <id>sys0node0membuf7mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf7l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0007</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-7/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-7/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-7/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-7/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -3460,19 +3460,19 @@
     <attribute><id>VPD_REC_NUM</id><default>12</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf12 -->
+<!-- Centaur L4 affiliated with membuf12 -->
 
 <targetInstance>
-    <id>sys0node0membuf12mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf12l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-12/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-12/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-12/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-12/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -3558,19 +3558,19 @@
     <attribute><id>VPD_REC_NUM</id><default>13</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf13 -->
+<!-- Centaur L4 affiliated with membuf13 -->
 
 <targetInstance>
-    <id>sys0node0membuf13mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf13l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-13/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-13/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-13/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-13/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -3656,19 +3656,19 @@
     <attribute><id>VPD_REC_NUM</id><default>14</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf14 -->
+<!-- Centaur L4 affiliated with membuf14 -->
 
 <targetInstance>
-    <id>sys0node0membuf14mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf14l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-14/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-14/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-14/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-14/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -3754,19 +3754,19 @@
     <attribute><id>VPD_REC_NUM</id><default>15</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf15 -->
+<!-- Centaur L4 affiliated with membuf15 -->
 
 <targetInstance>
-    <id>sys0node0membuf15mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf15l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-15/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-15/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-15/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-15/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -3851,19 +3851,19 @@
     <attribute><id>VPD_REC_NUM</id><default>20</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf20 -->
+<!-- Centaur L4 affiliated with membuf20 -->
 
 <targetInstance>
-    <id>sys0node0membuf20mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf20l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0014</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-20/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-20/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -3949,19 +3949,19 @@
     <attribute><id>VPD_REC_NUM</id><default>21</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf21 -->
+<!-- Centaur L4 affiliated with membuf21 -->
 
 <targetInstance>
-    <id>sys0node0membuf21mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf21l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0015</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-21/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-21/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -4047,19 +4047,19 @@
     <attribute><id>VPD_REC_NUM</id><default>22</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf22 -->
+<!-- Centaur L4 affiliated with membuf22 -->
 
 <targetInstance>
-    <id>sys0node0membuf22mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf22l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0016</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-22/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-22/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-22/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-22/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -4145,19 +4145,19 @@
     <attribute><id>VPD_REC_NUM</id><default>23</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf23 -->
+<!-- Centaur L4 affiliated with membuf23 -->
 
 <targetInstance>
-    <id>sys0node0membuf23mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf23l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0017</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-23/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-23/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-23/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-23/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -4242,19 +4242,19 @@
     <attribute><id>VPD_REC_NUM</id><default>28</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf28 -->
+<!-- Centaur L4 affiliated with membuf28 -->
 
 <targetInstance>
-    <id>sys0node0membuf28mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf28l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-28/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-28/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-28/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-28/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -4340,19 +4340,19 @@
     <attribute><id>VPD_REC_NUM</id><default>29</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf29 -->
+<!-- Centaur L4 affiliated with membuf29 -->
 
 <targetInstance>
-    <id>sys0node0membuf29mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf29l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-29/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-29/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-29/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-29/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -4438,19 +4438,19 @@
     <attribute><id>VPD_REC_NUM</id><default>30</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf30 -->
+<!-- Centaur L4 affiliated with membuf30 -->
 
 <targetInstance>
-    <id>sys0node0membuf30mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf30l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-30/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-30/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-30/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-30/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -4536,19 +4536,19 @@
     <attribute><id>VPD_REC_NUM</id><default>31</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf31 -->
+<!-- Centaur L4 affiliated with membuf31 -->
 
 <targetInstance>
-    <id>sys0node0membuf31mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf31l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-31/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-31/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-31/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-31/l4-0</default>
     </attribute>
 </targetInstance>
 
diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
index 7028fd31e..9039779cf 100644
--- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
@@ -8688,19 +8688,19 @@
     </attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf0 -->
+<!-- Centaur L4 affiliated with membuf0 -->
 
 <targetInstance>
-    <id>sys0node0membuf0mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf0l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0000</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-0/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-0/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -8786,19 +8786,19 @@
     <attribute><id>VPD_REC_NUM</id><default>1</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf1 -->
+<!-- Centaur L4 affiliated with membuf1 -->
 
 <targetInstance>
-    <id>sys0node0membuf1mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf1l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0001</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-1/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-1/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -8884,19 +8884,19 @@
     <attribute><id>VPD_REC_NUM</id><default>2</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf2 -->
+<!-- Centaur L4 affiliated with membuf2 -->
 
 <targetInstance>
-    <id>sys0node0membuf2mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf2l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0002</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-2/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-2/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -8982,19 +8982,19 @@
     <attribute><id>VPD_REC_NUM</id><default>3</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf3 -->
+<!-- Centaur L4 affiliated with membuf3 -->
 
 <targetInstance>
-    <id>sys0node0membuf3mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf3l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0003</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-3/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-3/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9080,19 +9080,19 @@
     <attribute><id>VPD_REC_NUM</id><default>4</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf4 -->
+<!-- Centaur L4 affiliated with membuf4 -->
 
 <targetInstance>
-    <id>sys0node0membuf4mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf4l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0004</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-4/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-4/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9178,19 +9178,19 @@
     <attribute><id>VPD_REC_NUM</id><default>5</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf5 -->
+<!-- Centaur L4 affiliated with membuf5 -->
 
 <targetInstance>
-    <id>sys0node0membuf5mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf5l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0005</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-5/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-5/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9276,19 +9276,19 @@
     <attribute><id>VPD_REC_NUM</id><default>6</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf6 -->
+<!-- Centaur L4 affiliated with membuf6 -->
 
 <targetInstance>
-    <id>sys0node0membuf6mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf6l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0006</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-6/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-6/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9374,19 +9374,19 @@
     <attribute><id>VPD_REC_NUM</id><default>7</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf7 -->
+<!-- Centaur L4 affiliated with membuf7 -->
 
 <targetInstance>
-    <id>sys0node0membuf7mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf7l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0007</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-7/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-7/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9472,19 +9472,19 @@
     <attribute><id>VPD_REC_NUM</id><default>8</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf8 -->
+<!-- Centaur L4 affiliated with membuf8 -->
 
 <targetInstance>
-    <id>sys0node0membuf8mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf8l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0008</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-8/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-8/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9570,19 +9570,19 @@
     <attribute><id>VPD_REC_NUM</id><default>9</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf9 -->
+<!-- Centaur L4 affiliated with membuf9 -->
 
 <targetInstance>
-    <id>sys0node0membuf9mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf9l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0009</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-9/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-9/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9668,19 +9668,19 @@
     <attribute><id>VPD_REC_NUM</id><default>10</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf10 -->
+<!-- Centaur L4 affiliated with membuf10 -->
 
 <targetInstance>
-    <id>sys0node0membuf10mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf10l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-10/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-10/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9766,19 +9766,19 @@
     <attribute><id>VPD_REC_NUM</id><default>11</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf11 -->
+<!-- Centaur L4 affiliated with membuf11 -->
 
 <targetInstance>
-    <id>sys0node0membuf11mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf11l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-11/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-11/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9864,19 +9864,19 @@
     <attribute><id>VPD_REC_NUM</id><default>12</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf12 -->
+<!-- Centaur L4 affiliated with membuf12 -->
 
 <targetInstance>
-    <id>sys0node0membuf12mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf12l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-12/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-12/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -9962,19 +9962,19 @@
     <attribute><id>VPD_REC_NUM</id><default>13</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf13 -->
+<!-- Centaur L4 affiliated with membuf13 -->
 
 <targetInstance>
-    <id>sys0node0membuf13mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf13l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-13/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-13/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10060,19 +10060,19 @@
     <attribute><id>VPD_REC_NUM</id><default>14</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf14 -->
+<!-- Centaur L4 affiliated with membuf14 -->
 
 <targetInstance>
-    <id>sys0node0membuf14mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf14l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-14/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-14/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10158,19 +10158,19 @@
     <attribute><id>VPD_REC_NUM</id><default>15</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf15 -->
+<!-- Centaur L4 affiliated with membuf15 -->
 
 <targetInstance>
-    <id>sys0node0membuf15mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf15l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C000F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-15/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-15/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10256,19 +10256,19 @@
     <attribute><id>VPD_REC_NUM</id><default>16</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf16 -->
+<!-- Centaur L4 affiliated with membuf16 -->
 
 <targetInstance>
-    <id>sys0node0membuf16mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf16l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0010</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-16/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-16/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10354,19 +10354,19 @@
     <attribute><id>VPD_REC_NUM</id><default>17</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf17 -->
+<!-- Centaur L4 affiliated with membuf17 -->
 
 <targetInstance>
-    <id>sys0node0membuf17mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf17l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0011</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-17/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-17/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10452,19 +10452,19 @@
     <attribute><id>VPD_REC_NUM</id><default>18</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf18 -->
+<!-- Centaur L4 affiliated with membuf18 -->
 
 <targetInstance>
-    <id>sys0node0membuf18mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf18l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0012</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-18/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-18/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10550,19 +10550,19 @@
     <attribute><id>VPD_REC_NUM</id><default>19</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf19 -->
+<!-- Centaur L4 affiliated with membuf19 -->
 
 <targetInstance>
-    <id>sys0node0membuf19mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf19l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0013</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-19/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-19/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10648,19 +10648,19 @@
     <attribute><id>VPD_REC_NUM</id><default>20</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf20 -->
+<!-- Centaur L4 affiliated with membuf20 -->
 
 <targetInstance>
-    <id>sys0node0membuf20mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf20l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0014</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-20/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-20/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10746,19 +10746,19 @@
     <attribute><id>VPD_REC_NUM</id><default>21</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf21 -->
+<!-- Centaur L4 affiliated with membuf21 -->
 
 <targetInstance>
-    <id>sys0node0membuf21mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf21l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0015</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-21/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-21/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10844,19 +10844,19 @@
     <attribute><id>VPD_REC_NUM</id><default>22</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf22 -->
+<!-- Centaur L4 affiliated with membuf22 -->
 
 <targetInstance>
-    <id>sys0node0membuf22mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf22l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0016</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-22/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-22/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -10942,19 +10942,19 @@
     <attribute><id>VPD_REC_NUM</id><default>23</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf23 -->
+<!-- Centaur L4 affiliated with membuf23 -->
 
 <targetInstance>
-    <id>sys0node0membuf23mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf23l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0017</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-23/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-23/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11040,19 +11040,19 @@
     <attribute><id>VPD_REC_NUM</id><default>24</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf24 -->
+<!-- Centaur L4 affiliated with membuf24 -->
 
 <targetInstance>
-    <id>sys0node0membuf24mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf24l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0018</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-24/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-24/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11138,19 +11138,19 @@
     <attribute><id>VPD_REC_NUM</id><default>25</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf25 -->
+<!-- Centaur L4 affiliated with membuf25 -->
 
 <targetInstance>
-    <id>sys0node0membuf25mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf25l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0019</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-25/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-25/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11236,19 +11236,19 @@
     <attribute><id>VPD_REC_NUM</id><default>26</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf26 -->
+<!-- Centaur L4 affiliated with membuf26 -->
 
 <targetInstance>
-    <id>sys0node0membuf26mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf26l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-26/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-26/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11334,19 +11334,19 @@
     <attribute><id>VPD_REC_NUM</id><default>27</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf27 -->
+<!-- Centaur L4 affiliated with membuf27 -->
 
 <targetInstance>
-    <id>sys0node0membuf27mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf27l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-27/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-27/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11432,19 +11432,19 @@
     <attribute><id>VPD_REC_NUM</id><default>28</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf28 -->
+<!-- Centaur L4 affiliated with membuf28 -->
 
 <targetInstance>
-    <id>sys0node0membuf28mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf28l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-28/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-28/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11530,19 +11530,19 @@
     <attribute><id>VPD_REC_NUM</id><default>29</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf29 -->
+<!-- Centaur L4 affiliated with membuf29 -->
 
 <targetInstance>
-    <id>sys0node0membuf29mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf29l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-29/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-29/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11628,19 +11628,19 @@
     <attribute><id>VPD_REC_NUM</id><default>30</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf30 -->
+<!-- Centaur L4 affiliated with membuf30 -->
 
 <targetInstance>
-    <id>sys0node0membuf30mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf30l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-30/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-30/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11726,19 +11726,19 @@
     <attribute><id>VPD_REC_NUM</id><default>31</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf31 -->
+<!-- Centaur L4 affiliated with membuf31 -->
 
 <targetInstance>
-    <id>sys0node0membuf31mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf31l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C001F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-31/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-31/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11824,19 +11824,19 @@
     <attribute><id>VPD_REC_NUM</id><default>32</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf32 -->
+<!-- Centaur L4 affiliated with membuf32 -->
 
 <targetInstance>
-    <id>sys0node0membuf32mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf32l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0020</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-32/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-32/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -11922,19 +11922,19 @@
     <attribute><id>VPD_REC_NUM</id><default>33</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf33 -->
+<!-- Centaur L4 affiliated with membuf33 -->
 
 <targetInstance>
-    <id>sys0node0membuf33mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf33l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0021</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-33/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-33/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12020,19 +12020,19 @@
     <attribute><id>VPD_REC_NUM</id><default>34</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf34 -->
+<!-- Centaur L4 affiliated with membuf34 -->
 
 <targetInstance>
-    <id>sys0node0membuf34mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf34l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0022</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-34/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-34/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12118,19 +12118,19 @@
     <attribute><id>VPD_REC_NUM</id><default>35</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf35 -->
+<!-- Centaur L4 affiliated with membuf35 -->
 
 <targetInstance>
-    <id>sys0node0membuf35mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf35l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0023</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-35/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-35/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12216,19 +12216,19 @@
     <attribute><id>VPD_REC_NUM</id><default>36</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf36 -->
+<!-- Centaur L4 affiliated with membuf36 -->
 
 <targetInstance>
-    <id>sys0node0membuf36mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf36l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0024</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-36/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-36/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12314,19 +12314,19 @@
     <attribute><id>VPD_REC_NUM</id><default>37</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf37 -->
+<!-- Centaur L4 affiliated with membuf37 -->
 
 <targetInstance>
-    <id>sys0node0membuf37mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf37l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0025</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-37/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-37/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12412,19 +12412,19 @@
     <attribute><id>VPD_REC_NUM</id><default>38</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf38 -->
+<!-- Centaur L4 affiliated with membuf38 -->
 
 <targetInstance>
-    <id>sys0node0membuf38mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf38l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0026</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-38/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-38/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12510,19 +12510,19 @@
     <attribute><id>VPD_REC_NUM</id><default>39</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf39 -->
+<!-- Centaur L4 affiliated with membuf39 -->
 
 <targetInstance>
-    <id>sys0node0membuf39mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf39l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0027</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-39/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-39/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12608,19 +12608,19 @@
     <attribute><id>VPD_REC_NUM</id><default>40</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf40 -->
+<!-- Centaur L4 affiliated with membuf40 -->
 
 <targetInstance>
-    <id>sys0node0membuf40mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf40l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0028</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-40/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-40/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12706,19 +12706,19 @@
     <attribute><id>VPD_REC_NUM</id><default>41</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf41 -->
+<!-- Centaur L4 affiliated with membuf41 -->
 
 <targetInstance>
-    <id>sys0node0membuf41mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf41l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0029</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-41/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-41/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12804,19 +12804,19 @@
     <attribute><id>VPD_REC_NUM</id><default>42</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf42 -->
+<!-- Centaur L4 affiliated with membuf42 -->
 
 <targetInstance>
-    <id>sys0node0membuf42mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf42l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C002A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-42/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-42/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -12902,19 +12902,19 @@
     <attribute><id>VPD_REC_NUM</id><default>43</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf43 -->
+<!-- Centaur L4 affiliated with membuf43 -->
 
 <targetInstance>
-    <id>sys0node0membuf43mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf43l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C002B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-43/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-43/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13000,19 +13000,19 @@
     <attribute><id>VPD_REC_NUM</id><default>44</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf44 -->
+<!-- Centaur L4 affiliated with membuf44 -->
 
 <targetInstance>
-    <id>sys0node0membuf44mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf44l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C002C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-44/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-44/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13098,19 +13098,19 @@
     <attribute><id>VPD_REC_NUM</id><default>45</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf45 -->
+<!-- Centaur L4 affiliated with membuf45 -->
 
 <targetInstance>
-    <id>sys0node0membuf45mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf45l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C002D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-45/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-45/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13196,19 +13196,19 @@
     <attribute><id>VPD_REC_NUM</id><default>46</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf46 -->
+<!-- Centaur L4 affiliated with membuf46 -->
 
 <targetInstance>
-    <id>sys0node0membuf46mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf46l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C002E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-46/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-46/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13294,19 +13294,19 @@
     <attribute><id>VPD_REC_NUM</id><default>47</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf47 -->
+<!-- Centaur L4 affiliated with membuf47 -->
 
 <targetInstance>
-    <id>sys0node0membuf47mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf47l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C002F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-47/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-47/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13392,19 +13392,19 @@
     <attribute><id>VPD_REC_NUM</id><default>48</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf48 -->
+<!-- Centaur L4 affiliated with membuf48 -->
 
 <targetInstance>
-    <id>sys0node0membuf48mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf48l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0030</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-48/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-48/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13490,19 +13490,19 @@
     <attribute><id>VPD_REC_NUM</id><default>49</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf49 -->
+<!-- Centaur L4 affiliated with membuf49 -->
 
 <targetInstance>
-    <id>sys0node0membuf49mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf49l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0031</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-49/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-49/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13588,19 +13588,19 @@
     <attribute><id>VPD_REC_NUM</id><default>50</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf50 -->
+<!-- Centaur L4 affiliated with membuf50 -->
 
 <targetInstance>
-    <id>sys0node0membuf50mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf50l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0032</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-50/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-50/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13686,19 +13686,19 @@
     <attribute><id>VPD_REC_NUM</id><default>51</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf51 -->
+<!-- Centaur L4 affiliated with membuf51 -->
 
 <targetInstance>
-    <id>sys0node0membuf51mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf51l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0033</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-51/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-51/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13784,19 +13784,19 @@
     <attribute><id>VPD_REC_NUM</id><default>52</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf52 -->
+<!-- Centaur L4 affiliated with membuf52 -->
 
 <targetInstance>
-    <id>sys0node0membuf52mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf52l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0034</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-52/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-52/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13882,19 +13882,19 @@
     <attribute><id>VPD_REC_NUM</id><default>53</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf53 -->
+<!-- Centaur L4 affiliated with membuf53 -->
 
 <targetInstance>
-    <id>sys0node0membuf53mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf53l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0035</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-53/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-53/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -13980,19 +13980,19 @@
     <attribute><id>VPD_REC_NUM</id><default>54</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf54 -->
+<!-- Centaur L4 affiliated with membuf54 -->
 
 <targetInstance>
-    <id>sys0node0membuf54mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf54l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0036</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-54/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-54/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14078,19 +14078,19 @@
     <attribute><id>VPD_REC_NUM</id><default>55</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf55 -->
+<!-- Centaur L4 affiliated with membuf55 -->
 
 <targetInstance>
-    <id>sys0node0membuf55mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf55l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0037</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-55/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-55/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14176,19 +14176,19 @@
     <attribute><id>VPD_REC_NUM</id><default>56</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf56 -->
+<!-- Centaur L4 affiliated with membuf56 -->
 
 <targetInstance>
-    <id>sys0node0membuf56mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf56l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0038</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-56/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-56/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14274,19 +14274,19 @@
     <attribute><id>VPD_REC_NUM</id><default>57</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf57 -->
+<!-- Centaur L4 affiliated with membuf57 -->
 
 <targetInstance>
-    <id>sys0node0membuf57mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf57l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0039</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-57/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-57/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14372,19 +14372,19 @@
     <attribute><id>VPD_REC_NUM</id><default>58</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf58 -->
+<!-- Centaur L4 affiliated with membuf58 -->
 
 <targetInstance>
-    <id>sys0node0membuf58mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf58l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C003A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-58/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-58/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14470,19 +14470,19 @@
     <attribute><id>VPD_REC_NUM</id><default>59</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf59 -->
+<!-- Centaur L4 affiliated with membuf59 -->
 
 <targetInstance>
-    <id>sys0node0membuf59mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf59l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C003B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-59/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-59/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14568,19 +14568,19 @@
     <attribute><id>VPD_REC_NUM</id><default>60</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf60 -->
+<!-- Centaur L4 affiliated with membuf60 -->
 
 <targetInstance>
-    <id>sys0node0membuf60mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf60l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C003C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-60/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-60/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14666,19 +14666,19 @@
     <attribute><id>VPD_REC_NUM</id><default>61</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf61 -->
+<!-- Centaur L4 affiliated with membuf61 -->
 
 <targetInstance>
-    <id>sys0node0membuf61mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf61l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C003D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-61/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-61/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14764,19 +14764,19 @@
     <attribute><id>VPD_REC_NUM</id><default>62</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf62 -->
+<!-- Centaur L4 affiliated with membuf62 -->
 
 <targetInstance>
-    <id>sys0node0membuf62mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf62l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C003E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-62/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-62/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -14862,19 +14862,19 @@
     <attribute><id>VPD_REC_NUM</id><default>63</default></attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf63 -->
+<!-- Centaur L4 affiliated with membuf63 -->
 
 <targetInstance>
-    <id>sys0node0membuf63mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf63l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C003F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-63/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-63/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index e425fbf13..9fde630ba 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -717,11 +717,11 @@
 <!-- Hybrid targets -->
 
 <targetType>
-    <id>unit-mbs-power8</id>
+    <id>unit-l4-power8</id>
     <parent>unit</parent>
     <attribute>
         <id>TYPE</id>
-        <default>MBS</default>
+        <default>L4</default>
     </attribute>
 </targetType>
 
@@ -1035,23 +1035,6 @@
     </attribute>
 </targetType>
 
-<targetType>
-    <id>unit-mbs-venice</id>
-    <parent>unit-mbs-power8</parent>
-    <attribute>
-        <id>MODEL</id>
-        <default>VENICE</default>
-    </attribute>
-</targetType>
-
-<targetType>
-    <id>unit-mbs-murano</id>
-    <parent>unit-mbs-venice</parent>
-    <attribute>
-        <id>MODEL</id>
-        <default>MURANO</default>
-    </attribute>
-</targetType>
 
 <!-- Memory Buffer Target Types -->
 
@@ -1151,20 +1134,11 @@
     <attribute><id>MSS_BLUEWATERFALL_BROKEN</id></attribute>
 </targetType>
 
-<!-- Centaur MBS -->
+<!-- Centaur L4 -->
 
 <targetType>
-    <id>unit-mbs-centaur</id>
-    <parent>unit-mbs-power8</parent>
-    <attribute>
-        <id>PRIMARY_CAPABILITIES</id>
-        <default>
-            <field><id>supportsFsiScom</id><value>1</value></field>
-            <field><id>supportsXscom</id><value>0</value></field>
-            <field><id>supportsInbandScom</id><value>1</value></field>
-            <field><id>reserved</id><value>0</value></field>
-        </default>
-    </attribute>
+    <id>unit-l4-centaur</id>
+    <parent>unit-l4-power8</parent>
     <attribute>
         <id>MODEL</id>
         <default>CENTAUR</default>
diff --git a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
index 87647971f..e422c588e 100644
--- a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
@@ -2065,16 +2065,16 @@
 <!-- Centaur MBS affiliated with membuf4 -->
 
 <targetInstance>
-    <id>sys0node0membuf4mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf4l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0004</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-4/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-4/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -2161,16 +2161,16 @@
 <!-- Centaur MBS affiliated with membuf5 -->
 
 <targetInstance>
-    <id>sys0node0membuf5mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf5l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0005</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-5/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-5/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -2258,16 +2258,16 @@
 <!-- Centaur MBS affiliated with n2p0->mcs-4/membuf-20/ -->
 
 <targetInstance>
-    <id>sys0node0membuf20mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf20l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0014</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-20/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-20/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -2356,16 +2356,16 @@
 <!-- Centaur MBS affiliated with n2p0->mcs-5/membuf-21/ -->
 
 <targetInstance>
-    <id>sys0node0membuf21mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf21l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0015</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-21/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-21/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/l4-0</default>
     </attribute>
 </targetInstance>
 
diff --git a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
index 852683420..f8bc081db 100644
--- a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
@@ -2477,16 +2477,16 @@
 <!-- Centaur MBS affiliated with membuf0 -->
 
 <targetInstance>
-    <id>sys0node0membuf0mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf0l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0000</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-0/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-0/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -2576,16 +2576,16 @@
 <!-- Centaur MBS affiliated with membuf1 -->
 
 <targetInstance>
-    <id>sys0node0membuf1mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf1l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0001</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-1/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-1/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -2674,16 +2674,16 @@
 <!-- Centaur MBS affiliated with membuf2 -->
 
 <targetInstance>
-    <id>sys0node0membuf2mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf2l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0002</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-2/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-2/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-2/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-2/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -2772,16 +2772,16 @@
 <!-- Centaur MBS affiliated with membuf3 -->
 
 <targetInstance>
-    <id>sys0node0membuf3mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf3l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0003</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-3/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-3/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-3/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-3/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -2870,16 +2870,16 @@
 <!-- Centaur MBS affiliated with membuf4 -->
 
 <targetInstance>
-    <id>sys0node0membuf4mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf4l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0004</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-4/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-4/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -2968,16 +2968,16 @@
 <!-- Centaur MBS affiliated with membuf5 -->
 
 <targetInstance>
-    <id>sys0node0membuf5mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf5l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0005</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-5/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-5/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -3066,16 +3066,16 @@
 <!-- Centaur MBS affiliated with membuf6 -->
 
 <targetInstance>
-    <id>sys0node0membuf6mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf6l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0006</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-6/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-6/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-6/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-6/l4-0</default>
     </attribute>
 </targetInstance>
 
@@ -3164,16 +3164,16 @@
 <!-- Centaur MBS affiliated with membuf7 -->
 
 <targetInstance>
-    <id>sys0node0membuf7mbs0</id>
-    <type>unit-mbs-centaur</type>
+    <id>sys0node0membuf7l40</id>
+    <type>unit-l4-centaur</type>
     <attribute><id>HUID</id><default>0x000C0007</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-7/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-7/l4-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-7/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-7/l4-0</default>
     </attribute>
 </targetInstance>
 
diff --git a/src/usr/targeting/test/testtargeting.H b/src/usr/targeting/test/testtargeting.H
index f12f8127e..cdbc148db 100644
--- a/src/usr/targeting/test/testtargeting.H
+++ b/src/usr/targeting/test/testtargeting.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012                   */
+/* COPYRIGHT International Business Machines Corp. 2012,2013              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -54,6 +54,7 @@
 #include <targeting/common/entitypath.H>
 #include <targeting/common/target.H>
 #include <targeting/common/targetservice.H>
+#include <targeting/common/utilFilter.H>
 #include <targeting/common/iterators/rangefilter.H>
 #include <targeting/common/predicates/predicatectm.H>
 #include <targeting/common/predicates/predicatepostfixexpr.H>
@@ -232,7 +233,7 @@ class TargetingTestSuite : public CxxTest::TestSuite
                               TARG_RC_TEST_TARGET_FFDC,
                               0x0011223344556677,
                               0x8899aabbccddeeff);
-                               
+
         ErrlUserDetailsTarget(l_pTarget1).addToLog(l_err);
         ErrlUserDetailsTarget(l_pTarget2).addToLog(l_err);
 
@@ -240,6 +241,42 @@ class TargetingTestSuite : public CxxTest::TestSuite
 
         TS_TRACE(EXIT_MRK "testErrlTargetFFDC");
     }
+
+    /**
+     *  @brief Test Hostboot specific L4 Target support
+     */
+    void testL4Target()
+    {
+        TS_TRACE(ENTER_MRK "testL4Target" );
+#if 0
+        // Disabling test until ecid reg setup in simics
+        // is resolved
+        using namespace ERRORLOG;
+        using namespace TARGETING;
+        using namespace fapi;
+
+        TargetHandleList l_targs;
+
+        getAllChiplets( l_targs, TYPE_L4);
+
+        TARGETING::EntityPath phys_path_ptr;
+
+        if( l_targs.size() )
+        {
+
+            phys_path_ptr =  l_targs[0]->getAttr<TARGETING::ATTR_PHYS_PATH>();
+
+            TS_TRACE("%s",  phys_path_ptr.toString());
+
+        }
+        else
+        {
+            TS_FAIL("no L4 targets found in system");
+        }
+
+#endif
+        TS_TRACE(EXIT_MRK "testL4Target" );
+    }
 };
 
 #endif // End __TARGETING_TESTTARGETING_H
author	Richard J. Knight <rjknight@us.ibm.com>	2013-05-08 11:39:38 -0500
committer	A. Patrick Williams III <iawillia@us.ibm.com>	2013-06-14 11:19:22 -0500
commit	dcfcbcdea8737802ff615efde01545d6d6137b9f (patch)
tree	f4b3e96b83ec090c8f48779c18c03f077e638e00
parent	0f4bb93bb0255db58725cac3979c58784d2563f3 (diff)
download	talos-hostboot-dcfcbcdea8737802ff615efde01545d6d6137b9f.tar.gz talos-hostboot-dcfcbcdea8737802ff615efde01545d6d6137b9f.zip