Errl commit with component ID

Change-Id: Ic8fcd3c69330878e8e7a75ba6ba9d3c60aca6251
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/482
Tested-by: Jenkins Server
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: Monte K. Copeland <copelanm@us.ibm.com>

25 files changed, 64 insertions, 64 deletions

diff --git a/src/include/usr/errl/errlmanager.H b/src/include/usr/errl/errlmanager.H
index d6d5c5a05..67429cbba 100644
--- a/src/include/usr/errl/errlmanager.H
+++ b/src/include/usr/errl/errlmanager.H
@@ -70,7 +70,7 @@ namespace ERRORLOG
  */
 
 // TODO Work item 4104 to make comitter comp required, no default.
-void errlCommit(errlHndl_t& io_err, compId_t i_committerComp = 0 );
+void errlCommit(errlHndl_t& io_err, compId_t i_committerComp );
 
 /*****************************************************************************/
 // Forward class declarations
diff --git a/src/usr/cxxtest/cxxtestexec.C b/src/usr/cxxtest/cxxtestexec.C
index 5023c7a5b..0c5a633e5 100644
--- a/src/usr/cxxtest/cxxtestexec.C
+++ b/src/usr/cxxtest/cxxtestexec.C
@@ -50,7 +50,7 @@ namespace CxxTest
 using namespace INITSERVICE;
 
 trace_desc_t *g_trac_cxxtest = NULL;
-TRAC_INIT(&g_trac_cxxtest, "CXXTEST", 1024 );
+TRAC_INIT(&g_trac_cxxtest, CXXTEST_COMP_NAME, 1024 );
 
 
 /**
@@ -112,7 +112,7 @@ void _start(void *io_pArgs)
             //  move on.
             TS_FAIL( "ERROR: Task %s could not be loaded, committing errorlog",
                     *i );
-            errlCommit( l_errl );
+            errlCommit( l_errl, CXXTEST_COMP_ID );
             continue;
         }
 
diff --git a/src/usr/devicefw/associator.C b/src/usr/devicefw/associator.C
index bacb8bd34..60a0895e0 100644
--- a/src/usr/devicefw/associator.C
+++ b/src/usr/devicefw/associator.C
@@ -116,7 +116,7 @@ namespace DeviceFW
                               TWO_UINT32_TO_UINT64(i_opType, i_accType),
                               TO_UINT64(i_targetType)
                              );
-            errlCommit(l_errl);
+            errlCommit(l_errl,DEVFW_COMP_ID);
         }
 
         // Index offset to proper target type.  This is now lowest level of map.
diff --git a/src/usr/errl/test/errluserdetailtest.H b/src/usr/errl/test/errluserdetailtest.H
index 9f8b93f62..5d0d94682 100644
--- a/src/usr/errl/test/errluserdetailtest.H
+++ b/src/usr/errl/test/errluserdetailtest.H
@@ -235,7 +235,7 @@ public:
         l_FN_userdata.addToLog( l_errl, testfnstr2, sizeof(testfnstr2) );
 
         // commit the errorlog
-        errlCommit(l_errl );
+        errlCommit(l_errl, ERRL_COMP_ID );
 
         //  Maybe do some stuff here to find the committed errorlog back and
         //  see if it is still correct?  Later.
@@ -280,7 +280,7 @@ public:
         l_userdata.addToLog( l_errl );
 
         // commit the errorlog
-        errlCommit(l_errl );
+        errlCommit(l_errl, ERRL_COMP_ID );
 
     }
 
@@ -322,7 +322,7 @@ public:
          l_userdata.addToLog( l_errl );
 
         // commit the errorlog
-        errlCommit(l_errl );
+        errlCommit( l_errl, ERRL_COMP_ID );
 
     }
 
diff --git a/src/usr/fsi/fsidd.C b/src/usr/fsi/fsidd.C
index 5ce7329a0..b50834d31 100644
--- a/src/usr/fsi/fsidd.C
+++ b/src/usr/fsi/fsidd.C
@@ -452,7 +452,7 @@ errlHndl_t FsiDD::initializeHardware()
         l_err = initMasterControl(iv_master,TARGETING::FSI_MASTER_TYPE_MFSI);
         if( l_err )
         {
-            errlCommit(l_err);
+            errlCommit(l_err,FSI_COMP_ID);
         }
         else
         {
@@ -470,7 +470,7 @@ errlHndl_t FsiDD::initializeHardware()
                 {
                     //@todo - append the actual slave target to FFDC
                     // commit the log here so that we can move on to next port               
-                    errlCommit(l_err);
+                    errlCommit(l_err,FSI_COMP_ID);
 
                     //if this fails then some of the slaves below won't init,
                     //  but that is okay because the detected ports will be
@@ -504,7 +504,7 @@ errlHndl_t FsiDD::initializeHardware()
                         if( l_err )
                         {
                             // commit the log here so that we can move on to next port               
-                            errlCommit(l_err);
+                            errlCommit(l_err,FSI_COMP_ID);
                             break;
                         }
                         master_init_done = true;
@@ -519,7 +519,7 @@ errlHndl_t FsiDD::initializeHardware()
                     {
                         //@todo - append the actual slave target to FFDC
                         // commit the log here so that we can move on to next port               
-                        errlCommit(l_err);
+                        errlCommit(l_err,FSI_COMP_ID);
                     }
                 }
 
@@ -530,7 +530,7 @@ errlHndl_t FsiDD::initializeHardware()
         l_err = initMasterControl(iv_master,TARGETING::FSI_MASTER_TYPE_CMFSI);
         if( l_err )
         {
-            errlCommit(l_err);
+            errlCommit(l_err,FSI_COMP_ID);
         }
         else
         {
@@ -552,7 +552,7 @@ errlHndl_t FsiDD::initializeHardware()
                 {
                     //@todo - append the actual slave target to FFDC
                     // commit the log here so that we can move on to next port               
-                    errlCommit(l_err);
+                    errlCommit(l_err,FSI_COMP_ID);
                 }
             }
         }
diff --git a/src/usr/fsi/test/fsiddtest.H b/src/usr/fsi/test/fsiddtest.H
index 3535bd9f4..732fb5eb0 100644
--- a/src/usr/fsi/test/fsiddtest.H
+++ b/src/usr/fsi/test/fsiddtest.H
@@ -65,7 +65,7 @@ class FsiDDTest : public CxxTest::TestSuite
             fails++;
             TRACFCOMP(g_trac_fsi, "FsiDDTest::test_init> Error from device : RC=%X", l_err->reasonCode() );
             TS_FAIL( "FsiDDTest::test_init> ERROR : Unexpected error log from initMaster" );
-            errlCommit(l_err);
+            errlCommit(l_err,FSI_COMP_ID);
             delete l_err;
         }
 
@@ -276,7 +276,7 @@ class FsiDDTest : public CxxTest::TestSuite
                 TRACFCOMP(g_trac_fsi, "FsiDDTest::test_readWrite> Error from device : [%d] addr=0x%X, RC=%X", x, test_data[x].addr, l_err->reasonCode() );
                 TS_FAIL( "FsiDDTest::test_readWrite> ERROR : Unexpected error log from read1" );
                 fails++;
-                errlCommit(l_err);
+                errlCommit(l_err,FSI_COMP_ID);
                 delete l_err;
             }
 
@@ -304,7 +304,7 @@ class FsiDDTest : public CxxTest::TestSuite
                     TRACFCOMP(g_trac_fsi, "FsiDDTest::test_readWrite> Error from device : [%d] addr=0x%X, RC=%X", x, test_data[x].addr, l_err->reasonCode() );
                     TS_FAIL( "FsiDDTest::test_readWrite> ERROR : Unexpected error log from write1" );
                     fails++;
-                    errlCommit(l_err);
+                    errlCommit(l_err,FSI_COMP_ID);
                     delete l_err;
                 }
             }
@@ -329,7 +329,7 @@ class FsiDDTest : public CxxTest::TestSuite
                 TRACFCOMP(g_trac_fsi, "FsiDDTest::test_readWrite> Error from device : [%d] addr=0x%X, RC=%X", x, test_data[x].addr, l_err->reasonCode() );
                 TS_FAIL( "FsiDDTest::test_readWrite> ERROR : Unexpected error log from read2" );
                 fails++;
-                errlCommit(l_err);
+                errlCommit(l_err,FSI_COMP_ID);
                 delete l_err;
             }
         }
@@ -369,7 +369,7 @@ class FsiDDTest : public CxxTest::TestSuite
                     TRACFCOMP(g_trac_fsi, "FsiDDTest::test_readWrite> Error from device : addr=0x%X, RC=%X", test_data[x].addr, l_err->reasonCode() );
                     TS_FAIL( "FsiDDTest::test_readWrite> ERROR : Unexpected error log from write1" );
                     fails++;
-                    errlCommit(l_err);
+                    errlCommit(l_err,FSI_COMP_ID);
                     delete l_err;
                 }
             }
@@ -411,7 +411,7 @@ class FsiDDTest : public CxxTest::TestSuite
 
             if( l_err )
             {
-                errlCommit(l_err);
+                errlCommit(l_err,FSI_COMP_ID);
                 delete l_err;
             }
         }
diff --git a/src/usr/hwas/deconfigGard.C b/src/usr/hwas/deconfigGard.C
index e1f42c2c7..84f6fc5a2 100644
--- a/src/usr/hwas/deconfigGard.C
+++ b/src/usr/hwas/deconfigGard.C
@@ -223,7 +223,7 @@ void DeconfigGard::_deconfigureTarget(TARGETING::Target & i_target,
         l_pErr = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_INFORMATIONAL,
                                          MOD_DECONFIG_GARD,
                                          RC_TARGET_NOT_DECONFIGURABLE);
-        errlCommit(l_pErr);
+        errlCommit(l_pErr,HWAS_COMP_ID);
     }
     else
     {
@@ -402,7 +402,7 @@ errlHndl_t DeconfigGard::_createGardRecord(const TARGETING::Target & i_target,
         l_pErr = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                          MOD_DECONFIG_GARD,
                                          RC_TARGET_NOT_GARDABLE);
-        errlCommit(l_pErr);
+        errlCommit(l_pErr,HWAS_COMP_ID);
     }
     else
     {
diff --git a/src/usr/hwas/test/hwasGardTest.H b/src/usr/hwas/test/hwasGardTest.H
index dda0de693..d863072b3 100644
--- a/src/usr/hwas/test/hwasGardTest.H
+++ b/src/usr/hwas/test/hwasGardTest.H
@@ -59,7 +59,7 @@ public:
         
         if (l_pErr)
         {
-            errlCommit(l_pErr);
+            errlCommit(l_pErr,HWAS_COMP_ID);
             TS_FAIL("testDeconfigure1: Error from getDeconfigureRecords");
         }
         else
@@ -91,7 +91,7 @@ public:
         
         if (l_pErr)
         {
-            errlCommit(l_pErr);
+            errlCommit(l_pErr,HWAS_COMP_ID);
             TS_FAIL("testDeconfigure2: Error from getDeconfigureRecords");
         }
         else
@@ -226,7 +226,7 @@ public:
         
         if (l_pErr)
         {
-            errlCommit(l_pErr);
+            errlCommit(l_pErr,HWAS_COMP_ID);
         }
     }
     
@@ -338,7 +338,7 @@ public:
         
         if (l_pErr)
         {
-            errlCommit(l_pErr);
+            errlCommit(l_pErr,HWAS_COMP_ID);
         }
     }
 
@@ -356,7 +356,7 @@ public:
         
         if (l_pErr)
         {
-            errlCommit(l_pErr);
+            errlCommit(l_pErr,HWAS_COMP_ID);
             TS_FAIL("testGard1: Error from getGardRecords");
         }
         else
@@ -380,7 +380,7 @@ public:
         
         if (l_pErr)
         {
-            errlCommit(l_pErr);
+            errlCommit(l_pErr,HWAS_COMP_ID);
             TS_FAIL("testGard2: Error from getGardRecords");
         }
         else
@@ -419,7 +419,7 @@ public:
         
         if (l_pErr)
         {
-            errlCommit(l_pErr);
+            errlCommit(l_pErr,HWAS_COMP_ID);
             TS_FAIL("testGard3: Error from getGardRecords");
         }
         else
@@ -542,7 +542,7 @@ public:
                 
         if (l_pErr)
         {
-            errlCommit(l_pErr);
+            errlCommit(l_pErr,HWAS_COMP_ID);
         }
     }
     
@@ -661,7 +661,7 @@ public:
                 
         if (l_pErr)
         {
-            errlCommit(l_pErr);
+            errlCommit(l_pErr,HWAS_COMP_ID);
         }
     }
     
@@ -809,7 +809,7 @@ public:
                 
         if (l_pErr)
         {
-            errlCommit(l_pErr);
+            errlCommit(l_pErr,HWAS_COMP_ID);
         }
     }
     
@@ -912,7 +912,7 @@ public:
                 
         if (l_pErr)
         {
-            errlCommit(l_pErr);
+            errlCommit(l_pErr,HWAS_COMP_ID);
         }
     }
 };
diff --git a/src/usr/hwas/testHWP.C b/src/usr/hwas/testHWP.C
index ce18e1961..6bb0f851f 100644
--- a/src/usr/hwas/testHWP.C
+++ b/src/usr/hwas/testHWP.C
@@ -85,7 +85,7 @@ void    testHWP( void * io_pArgs )
     if (l_err)
     {
         TRACFCOMP( g_trac_hwas, "testHWP failed, committing errorlog");
-        errlCommit(l_err);
+        errlCommit(l_err,HWAS_COMP_ID);
     }
 
     TASKARGS_WAIT_AND_ENDTASK();
diff --git a/src/usr/hwpf/plat/fapiPlatUtil.C b/src/usr/hwpf/plat/fapiPlatUtil.C
index 667e4dffe..6abbc1c57 100644
--- a/src/usr/hwpf/plat/fapiPlatUtil.C
+++ b/src/usr/hwpf/plat/fapiPlatUtil.C
@@ -106,7 +106,7 @@ void fapiLogError(fapi::ReturnCode & io_rc)
 
     // Commit the error log. This will delete the error log and set the handle
     // to NULL.
-    errlCommit(l_pError);
+    errlCommit(l_pError,HWPF_COMP_ID);
 }
 
 //****************************************************************************
diff --git a/src/usr/hwpf/test/hwpftest.H b/src/usr/hwpf/test/hwpftest.H
index fa503f3b5..ef497c0cc 100644
--- a/src/usr/hwpf/test/hwpftest.H
+++ b/src/usr/hwpf/test/hwpftest.H
@@ -97,7 +97,7 @@ public:
         if (l_err)
         {
             TS_TRACE("testHwpf2: Unit Test passed. hwpTestError failed. Error logged");
-            errlCommit(l_err);
+            errlCommit(l_err,HWPF_COMP_ID);
         }
         else
         {
@@ -127,7 +127,7 @@ public:
         if (l_err)
         {
             TS_FAIL("testHwpf3: Unit Test failed. hwpTestConfig failed. Error logged");
-            errlCommit(l_err);
+            errlCommit(l_err,HWPF_COMP_ID);
         }
         else
         {
@@ -148,7 +148,7 @@ public:
         if (l_err)
         {
             TS_FAIL("testHwpf4: Unit Test failed. hwpTestAttributes failed. Error logged");
-            errlCommit(l_err);
+            errlCommit(l_err,HWPF_COMP_ID);
         }
         else
         {
diff --git a/src/usr/i2c/test/i2ctest.H b/src/usr/i2c/test/i2ctest.H
index 314f8c523..bb4453d68 100755
--- a/src/usr/i2c/test/i2ctest.H
+++ b/src/usr/i2c/test/i2ctest.H
@@ -133,7 +133,7 @@ class I2CTest: public CxxTest::TestSuite
             if ( err )
             {
                 TS_FAIL( "testI2C1 failed!  Error committed." );
-                errlCommit( err );
+                errlCommit( err, I2C_COMP_ID );
             }
             else
             {
diff --git a/src/usr/initservice/baseinitsvc/initservice.C b/src/usr/initservice/baseinitsvc/initservice.C
index a51e909ed..e97df2c3b 100644
--- a/src/usr/initservice/baseinitsvc/initservice.C
+++ b/src/usr/initservice/baseinitsvc/initservice.C
@@ -327,7 +327,7 @@ void InitService::init( void *i_ptr )
         TRACFCOMP( g_trac_initsvc,
                    "ERROR:  extra errorlog found: %p",
                    l_errl );
-        errlCommit( l_errl );
+        errlCommit( l_errl, INITSVC_COMP_ID );
         assert( 0 );
     }
 
diff --git a/src/usr/initservice/extinitsvc/extinitsvc.C b/src/usr/initservice/extinitsvc/extinitsvc.C
index d721ff8cd..2f8d5cb0d 100644
--- a/src/usr/initservice/extinitsvc/extinitsvc.C
+++ b/src/usr/initservice/extinitsvc/extinitsvc.C
@@ -162,7 +162,7 @@ void ExtInitSvc::init( void *i_ptr )
         TRACFCOMP( g_trac_initsvc,
                    "ERROR:  extra errorlog found: %p",
                    l_errl );
-        errlCommit( l_errl );
+        errlCommit( l_errl, INITSVC_COMP_ID );
         assert( 0 );
     }
 
@@ -218,7 +218,7 @@ void ExtInitSvc::init( void *i_ptr )
         {
             TRACFCOMP( g_trac_initsvc,
                        "Committing error from cxxtask launch" );
-            errlCommit( l_cxxerrl );
+            errlCommit( l_cxxerrl, INITSVC_COMP_ID );
             break;      // ERROR, break out of do-while.
         }
 
@@ -235,7 +235,7 @@ void ExtInitSvc::init( void *i_ptr )
                        " Child task returned 0x%llx, errlog=0x%p",
                        l_cxxchildrc,
                        l_cxxchilderrl );
-            errlCommit( l_cxxchilderrl );
+            errlCommit( l_cxxchilderrl, INITSVC_COMP_ID );
         }
         else
         {
@@ -266,7 +266,7 @@ void ExtInitSvc::init( void *i_ptr )
                         INITSERVICE::CXXTEST_FAILED_NO_ERRLOG,
                         l_cxxchildrc,
                         0 );
-                errlCommit( l_cxxerrl );
+                errlCommit( l_cxxerrl, INITSVC_COMP_ID );
             }   // end if
         }   //  end else
 
diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C
index addc6f071..36da4d544 100644
--- a/src/usr/initservice/istepdispatcher/istepdispatcher.C
+++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C
@@ -337,7 +337,7 @@ void    IStepDispatcher::singleStepISteps( void *  io_ptr )   const
                     TRACFCOMP( g_trac_initsvc,
                                "ERROR 0x%x:  function launch FAIL",
                                l_taskStatus );
-                    errlCommit( l_errl );
+                    errlCommit( l_errl, INITSVC_COMP_ID );
                 }
                 else
                 {
@@ -359,7 +359,7 @@ void    IStepDispatcher::singleStepISteps( void *  io_ptr )   const
                         //  tell the user that the IStep returned an errorlog
                         l_taskStatus    =   SPLESS_TASKRC_RETURNED_ERRLOG;
                         // go ahead and commit the child errorlog
-                        errlCommit( l_errl);
+                        errlCommit( l_errl, INITSVC_COMP_ID);
                     }
 
                     //  massage the return code from the IStep -
@@ -422,7 +422,7 @@ void    IStepDispatcher::singleStepISteps( void *  io_ptr )   const
     if ( l_errl )
     {
         // if we do then commit it and stop here.
-        errlCommit( l_errl );
+        errlCommit( l_errl, INITSVC_COMP_ID );
         assert(0);
     }
 
@@ -563,7 +563,7 @@ void    IStepDispatcher::runAllISteps( void * io_ptr )   const
                    l_IStep,
                    l_SubStep,
                    l_errl );
-        errlCommit( l_errl );
+        errlCommit( l_errl, INITSVC_COMP_ID );
         assert( 0 );
     }
 
diff --git a/src/usr/initservice/taskargs/taskargs.C b/src/usr/initservice/taskargs/taskargs.C
index 186bb93c6..073c33366 100644
--- a/src/usr/initservice/taskargs/taskargs.C
+++ b/src/usr/initservice/taskargs/taskargs.C
@@ -135,7 +135,7 @@ void    TaskArgs::clear()
                 ERR_MRK "ERROR: errorlog %p was left in TaskArgs",
                 iv_errl );
 
-        errlCommit(iv_errl);
+        errlCommit(iv_errl,INITSVC_COMP_ID);
     }
 
 }
diff --git a/src/usr/initservice/test/initservicetest.H b/src/usr/initservice/test/initservicetest.H
index 1a8951ff3..f1494d5ec 100644
--- a/src/usr/initservice/test/initservicetest.H
+++ b/src/usr/initservice/test/initservicetest.H
@@ -118,7 +118,7 @@ public:
         {
             TS_TRACE( "SUCCESS: startTask returned an errorlog.\n");
             //  clean up
-            errlCommit( l_errl );
+            errlCommit( l_errl, INITSVC_COMP_ID );
         }
         else
         {
@@ -148,7 +148,7 @@ public:
         if ( l_errl )
         {
             TS_FAIL( "ERROR: StartTask returned an error log.\n");
-            errlCommit( l_errl );
+            errlCommit( l_errl, INITSVC_COMP_ID );
         }
         else
         {
@@ -179,7 +179,7 @@ public:
         if ( l_errl )
         {
             TS_TRACE( "SUCCESS: startTask returned an error log.\n");
-            errlCommit( l_errl );
+            errlCommit( l_errl, INITSVC_COMP_ID );
         }
         else
         {
diff --git a/src/usr/pnor/pnorrp.C b/src/usr/pnor/pnorrp.C
index 76bcb89b1..0aa4421e9 100644
--- a/src/usr/pnor/pnorrp.C
+++ b/src/usr/pnor/pnorrp.C
@@ -208,7 +208,7 @@ void PnorRP::initDaemon()
 
     if( l_errhdl )
     {
-        errlCommit(l_errhdl);
+        errlCommit(l_errhdl,PNOR_COMP_ID);
         iv_startupRC = l_errhdl->reasonCode();
     }
 
@@ -456,7 +456,7 @@ void PnorRP::waitForMessage()
 
             if( l_errhdl )
             {
-                errlCommit(l_errhdl);
+                errlCommit(l_errhdl,PNOR_COMP_ID);
             }
 
 
diff --git a/src/usr/pnor/test/pnorrptest.H b/src/usr/pnor/test/pnorrptest.H
index 8854331b9..9f562a590 100644
--- a/src/usr/pnor/test/pnorrptest.H
+++ b/src/usr/pnor/test/pnorrptest.H
@@ -91,7 +91,7 @@ class PnorRpTest : public CxxTest::TestSuite
                     TRACFCOMP(g_trac_pnor, "PnorRpTest::test_getSectionInfo> ERROR : getSectionInfo returned error for %d : RC=%X", id, errhdl->reasonCode() );
                     TS_FAIL( "PnorRpTest::test_getSectionInfo> ERROR : Unexpected error log" );
                     fails++;
-                    errlCommit(errhdl);
+                    errlCommit(errhdl,PNOR_COMP_ID);
                 }
                 else
                 {
diff --git a/src/usr/scom/test/scomtest.H b/src/usr/scom/test/scomtest.H
index 34134b7ab..3d7067c50 100644
--- a/src/usr/scom/test/scomtest.H
+++ b/src/usr/scom/test/scomtest.H
@@ -118,7 +118,7 @@ public:
                 TRACFCOMP(g_trac_scom, "ScomTest::test_FSISCOMreadWrite> Write: Error from device : addr=0x%X, RC=%X", test_data[x].addr, l_err->reasonCode() );
                 TS_FAIL( "ScomTest::test_FSISCOMreadWrite> ERROR : Unexpected error log from write1" );
                 fails++;
-                errlCommit(l_err);
+                errlCommit(l_err,SCOM_COMP_ID);
                 delete l_err;
             }
         }
@@ -138,7 +138,7 @@ public:
                 TRACFCOMP(g_trac_scom, "ScomTest::test_FSISCOMreadWrite> read: Error from device : addr=0x%X, RC=%X", test_data[x].addr, l_err->reasonCode() );
                 TS_FAIL( "ScomTest::test_FSISCOMreadWrite> ERROR : Unexpected error log from write1" );
                 fails++;
-                errlCommit(l_err);
+                errlCommit(l_err,SCOM_COMP_ID);
                 delete l_err;
             }
             else if(read_data[x] != test_data[x].data)
diff --git a/src/usr/targeting/attrrp.C b/src/usr/targeting/attrrp.C
index 624a10849..80ab93ab1 100644
--- a/src/usr/targeting/attrrp.C
+++ b/src/usr/targeting/attrrp.C
@@ -108,7 +108,7 @@ namespace TARGETING
                 TRACFCOMP(g_trac_targeting,
                           ERR_MRK "AttrRP: Critical error in startup and no "
                                   "TaskArgs given by init-service.");
-                errlCommit(l_errl);
+                errlCommit(l_errl,TARG_COMP_ID);
             }
         }
     }
@@ -248,7 +248,7 @@ namespace TARGETING
                                                         msg->type,
                                                         section)
                                                   );
-                errlCommit(l_errl);
+                errlCommit(l_errl,TARG_COMP_ID);
 
             }
 
diff --git a/src/usr/targeting/test/targetingtest.H b/src/usr/targeting/test/targetingtest.H
index 813fde4f9..e86ca08c1 100644
--- a/src/usr/targeting/test/targetingtest.H
+++ b/src/usr/targeting/test/targetingtest.H
@@ -1136,7 +1136,7 @@ class TargetingTestSuite: public CxxTest::TestSuite
         {
             errlHndl_t l_pErrLog = static_cast<ERRORLOG::ErrlEntry*>(
                                                                      l_rc.releasePlatData());
-            ERRORLOG::errlCommit(l_pErrLog);
+            ERRORLOG::errlCommit(l_pErrLog,TARG_COMP_ID);
         }
 
         delete l_pFapiTarget;
@@ -1207,7 +1207,7 @@ class TargetingTestSuite: public CxxTest::TestSuite
         if(l_rc)
         {
             errlHndl_t l_pErrLog = static_cast<ERRORLOG::ErrlEntry*>(l_rc.releasePlatData());
-            ERRORLOG::errlCommit(l_pErrLog);
+            ERRORLOG::errlCommit(l_pErrLog,TARG_COMP_ID);
         }
     }
 
diff --git a/src/usr/vfs/test/vfstest.H b/src/usr/vfs/test/vfstest.H
index 6c85152e9..5e33a0b33 100644
--- a/src/usr/vfs/test/vfstest.H
+++ b/src/usr/vfs/test/vfstest.H
@@ -47,14 +47,14 @@ class VfsTest: public CxxTest::TestSuite
             if(err)
             {
                 TS_FAIL("module_load failed");
-                ERRORLOG::errlCommit(err);
+                ERRORLOG::errlCommit(err,VFS_COMP_ID);
             }
 
             err = VFS::module_address("testdata",addr,size);
             if(err)
             {
                 TS_FAIL("module_address failed");
-                ERRORLOG::errlCommit(err);
+                ERRORLOG::errlCommit(err,VFS_COMP_ID);
             }
             else
             {
diff --git a/src/usr/xscom/test/xscomtest.H b/src/usr/xscom/test/xscomtest.H
index e39608c4f..00b9e43a9 100644
--- a/src/usr/xscom/test/xscomtest.H
+++ b/src/usr/xscom/test/xscomtest.H
@@ -172,7 +172,7 @@ public:
         if (l_err)
         {
             TS_FAIL("testXscom1 failed!  Error committed.");
-            errlCommit(l_err);
+            errlCommit(l_err,XSCOM_COMP_ID);
         }
         else
         {
diff --git a/src/usr/xscom/xscom.C b/src/usr/xscom/xscom.C
index cdc17a76c..0f84b1da0 100644
--- a/src/usr/xscom/xscom.C
+++ b/src/usr/xscom/xscom.C
@@ -596,7 +596,7 @@ errlHndl_t xscomPerformOp(DeviceFW::OperationType i_opType,
                 {
                     l_err->setSev(ERRORLOG::ERRL_SEV_INFORMATIONAL);
                     // Commit/delete error
-                    errlCommit(l_err);
+                    errlCommit(l_err,XSCOM_COMP_ID);
                 }
             }
         }