diff options
| author | Matt Derksen <mderkse1@us.ibm.com> | 2017-06-06 15:39:40 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-23 10:29:55 -0400 |
| commit | c4dc9402e4237e5318c834f4535f6c1f58419951 (patch) | |
| tree | 95b33383281d8863c6ae6ae2532947b07c7733cd /src/usr/errl | |
| parent | b22bfa0529a673baea56805fa4fcc1ba65c29666 (diff) | |
| download | talos-hostboot-c4dc9402e4237e5318c834f4535f6c1f58419951.tar.gz talos-hostboot-c4dc9402e4237e5318c834f4535f6c1f58419951.zip | |
Allow deconfig without a callout in error log.
Change-Id: Ia2ce6f89b4fbc4bbafa355cb1da07bdbd360c317
RTC: 174701
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42085
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/errl')
| -rw-r--r-- | src/usr/errl/errlentry.C | 7 | ||||
| -rw-r--r-- | src/usr/errl/plugins/errludcallout.H | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/usr/errl/errlentry.C b/src/usr/errl/errlentry.C index 86d94396e..5c1c681a5 100644 --- a/src/usr/errl/errlentry.C +++ b/src/usr/errl/errlentry.C @@ -779,8 +779,8 @@ void ErrlEntry::setSubSystemIdBasedOnCallouts() // figure out the highest priority callout, just grab // the first one if there are several with the same // priority. - if( highestPriorityCallout == NULL || - ( pData->priority > highestPriorityCallout->priority) ) + if( (highestPriorityCallout == NULL) || + (pData->priority > highestPriorityCallout->priority) ) { highestPriorityCallout = pData; } @@ -789,7 +789,8 @@ void ErrlEntry::setSubSystemIdBasedOnCallouts() // if this pointer is not null it will be pointing to the // highest priority entry - if( highestPriorityCallout == NULL ) + if((highestPriorityCallout == NULL) || + (highestPriorityCallout->priority == HWAS::SRCI_PRIORITY_NONE) ) { // no callouts in log, add default callout for hb code and // add trace diff --git a/src/usr/errl/plugins/errludcallout.H b/src/usr/errl/plugins/errludcallout.H index a1cb7dfe6..f13570ab3 100644 --- a/src/usr/errl/plugins/errludcallout.H +++ b/src/usr/errl/plugins/errludcallout.H @@ -307,6 +307,7 @@ case HWAS::_type: i_parser.PrintString( "Procedure", #_type); break; { #define case_PRIORITY(_type) \ case HWAS::_type: i_parser.PrintString( "Priority", #_type); break; + case_PRIORITY(SRCI_PRIORITY_NONE) case_PRIORITY(SRCI_PRIORITY_LOW) case_PRIORITY(SRCI_PRIORITY_MEDC) case_PRIORITY(SRCI_PRIORITY_MEDB) |
