starlingx/metal
Code Issues Proposed changes

Merge "Add the mask check for the loaded config"

Browse Source
This commit is contained in:
Zuul
2019-10-28 15:18:25 +00:00
committed by Gerrit Code Review
parent dc63a53864 73146540e2
commit 9140819b86
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mtce/src/hostw/hostwInit.cpp
View File

@@ -142,12 +142,21 @@ int daemon_configure ( void )
if (ini_parse(HOSTWD_CONFIG_FILE, hostw_process_config, config) < 0)
{
elog("Can't load '%s'\n", HOSTWD_CONFIG_FILE);
return (FAIL_INI_CONFIG);
return (FAIL_LOAD_INI);
}
if (ini_parse(PMOND_CONFIG_FILE, hostw_process_config, config) < 0)
{
elog("Can't load '%s'\n", PMOND_CONFIG_FILE);
return (FAIL_LOAD_INI);
}
/* Verify loaded config against an expected mask
* as an ini file fault detection method */
if ( config->mask != CONFIG_MASK )
{
elog ("Error: host watchdog configuration failed (%x)\n",
((-1 ^ config->mask) & CONFIG_MASK));
return (FAIL_INI_CONFIG);
}