diff options
| author | Mike Jones <mjjones@us.ibm.com> | 2012-04-19 11:49:40 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-04-20 11:46:44 -0500 |
| commit | 065cd0b989d1395b1b462d6a2031a6ff130f9a6d (patch) | |
| tree | 463f82e54c91afae87fdb9892e6a1c26ea6f7ce5 | |
| parent | a4efd44c7580647a242c6f27aab3dc2dde78c845 (diff) | |
| download | talos-hostboot-065cd0b989d1395b1b462d6a2031a6ff130f9a6d.tar.gz talos-hostboot-065cd0b989d1395b1b462d6a2031a6ff130f9a6d.zip | |
INITSVC: Fix duplicate error log tags
Change-Id: Ib0717d6ea916fbc330cadd5dce420cc80694eaf0
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/915
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
| -rw-r--r-- | src/include/usr/initservice/initsvcreasoncodes.H | 1 | ||||
| -rw-r--r-- | src/usr/initservice/baseinitsvc/initservice.C | 6 | ||||
| -rw-r--r-- | src/usr/initservice/istepdispatcher/istepdispatcher.C | 26 |
3 files changed, 18 insertions, 15 deletions
diff --git a/src/include/usr/initservice/initsvcreasoncodes.H b/src/include/usr/initservice/initsvcreasoncodes.H index 79a5d5a4e..8bb41d85e 100644 --- a/src/include/usr/initservice/initsvcreasoncodes.H +++ b/src/include/usr/initservice/initsvcreasoncodes.H @@ -68,6 +68,7 @@ enum InitServiceReasonCode INITSVC_LOAD_MODULE_FAILED = INITSVC_COMP_ID | 0x0a, ISTEP_SINGLESTEP_SHUTDOWN = INITSVC_COMP_ID | 0x0b, ISTEP_SINGLESTEP_ASYNC_RCVD = INITSVC_COMP_ID | 0x0c, + ISTEP_BKPOINT_ASYNC_RCVD = INITSVC_COMP_ID | 0x0d, }; diff --git a/src/usr/initservice/baseinitsvc/initservice.C b/src/usr/initservice/baseinitsvc/initservice.C index 2187b8cb0..c352d5353 100644 --- a/src/usr/initservice/baseinitsvc/initservice.C +++ b/src/usr/initservice/baseinitsvc/initservice.C @@ -368,18 +368,18 @@ errlHndl_t InitService::executeFn( /*@ errorlog tag * @errortype ERRL_SEV_CRITICAL_SYS_TERM * @moduleid BASE_INITSVC_MOD_ID - * @reasoncode WAIT_TASK_FAILED + * @reasoncode WAIT_FN_FAILED * @userdata1 task id or task return code * @userdata2 returned status from task * - * @devdesc Initialization Service launched a task and the task returned an error. + * @devdesc Initialization Service launched a function and the task returned an error. * * */ l_errl = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_CRITICAL_SYS_TERM, INITSERVICE::BASE_INITSVC_MOD_ID, - INITSERVICE::WAIT_TASK_FAILED, + INITSERVICE::WAIT_FN_FAILED, l_tidretrc, l_childsts ); diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C index 8d55a30f1..3f5cd5594 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.C +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C @@ -314,18 +314,19 @@ void IStepDispatcher::singleStepISteps( errlHndl_t &io_rtaskRetErrl ) /*@ errorlog tag * @errortype ERRL_SEV_INFORMATIONAL - * @moduleid BASE_INITSVC_MOD_ID + * @moduleid ISTEP_INITSVC_MOD_ID * @reasoncode ISTEP_SINGLESTEP_ASYNC_RCVD * @userdata1 type of packet * @userdata2 first data word * - * @devdesc IStepDisp was expecting a synchronous message - * and received an asynchonous message. + * @devdesc IStepDisp singleStepISteps was expecting a + * synchronous message and received an asynchonous + * message. * */ errlHndl_t l_errlAsync = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_INFORMATIONAL, - INITSERVICE::BASE_INITSVC_MOD_ID, + INITSERVICE::ISTEP_INITSVC_MOD_ID, INITSERVICE::ISTEP_SINGLESTEP_ASYNC_RCVD, iv_pMsg->type, iv_pMsg->data[0] ); @@ -431,7 +432,7 @@ void IStepDispatcher::singleStepISteps( errlHndl_t &io_rtaskRetErrl ) /*@ errorlog tag * @errortype ERRL_SEV_INFORMATIONAL - * @moduleid BASE_INITSVC_MOD_ID + * @moduleid ISTEP_INITSVC_MOD_ID * @reasoncode ISTEP_SINGLESTEP_SHUTDOWN * @userdata1 0 * @userdata2 0 @@ -441,7 +442,7 @@ void IStepDispatcher::singleStepISteps( errlHndl_t &io_rtaskRetErrl ) */ l_errl = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_INFORMATIONAL, - INITSERVICE::BASE_INITSVC_MOD_ID, + INITSERVICE::ISTEP_INITSVC_MOD_ID, INITSERVICE::ISTEP_SINGLESTEP_SHUTDOWN, 0, 0 ); @@ -737,19 +738,20 @@ void IStepDispatcher::handleSPlessBreakPoint( uint32_t i_info ) /*@ errorlog tag * @errortype ERRL_SEV_INFORMATIONAL - * @moduleid BASE_INITSVC_MOD_ID - * @reasoncode ISTEP_SINGLESTEP_ASYNC_RCVD + * @moduleid ISTEP_INITSVC_MOD_ID + * @reasoncode ISTEP_BKPOINT_ASYNC_RCVD * @userdata1 type of packet * @userdata2 first data word * - * @devdesc IStepDisp was expecting a synchronous message - * and received an asynchonous message. + * @devdesc IStepDisp handleSPlessBreakPoint was expecting a + * synchronous message and received an asynchonous + * message. * */ errlHndl_t l_errlAsync = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_INFORMATIONAL, - INITSERVICE::BASE_INITSVC_MOD_ID, - INITSERVICE::ISTEP_SINGLESTEP_ASYNC_RCVD, + INITSERVICE::ISTEP_INITSVC_MOD_ID, + INITSERVICE::ISTEP_BKPOINT_ASYNC_RCVD, iv_pMsg->type, iv_pMsg->data[0] ); |
