deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 18:47:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ID: 46 - ipmi_fwum needs some re-work

Browse Source 
Dismantle KfwumMain() - tracelog

Commit moves tracelog out of KfwumMain() and changes return type of
KfwumGetTraceLog().
This commit is contained in:
Zdenek Styblik 2013-10-26 19:26:16 +00:00
parent 22f294fc27
commit 770e61663f
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ipmitool/lib/ipmi_fwum.c
View File

@ -156,7 +156,7 @@ static tKFWUM_Status KfwumStartFirmwareUpgrade(struct ipmi_intf *intf);
static tKFWUM_Status KfwumGetInfoFromFirmware(unsigned char *pBuf, static tKFWUM_Status KfwumGetInfoFromFirmware(unsigned char *pBuf,
unsigned long bufSize, tKFWUM_InFirmwareInfo *pInfo); unsigned long bufSize, tKFWUM_InFirmwareInfo *pInfo);
static void KfwumFixTableVersionForOldFirmware(tKFWUM_InFirmwareInfo *pInfo); static void KfwumFixTableVersionForOldFirmware(tKFWUM_InFirmwareInfo *pInfo);
static tKFWUM_Status KfwumGetTraceLog(struct ipmi_intf *intf); int KfwumGetTraceLog(struct ipmi_intf *intf);
tKFWUM_Status ipmi_kfwum_checkfwcompat(tKFWUM_BoardInfo boardInfo, tKFWUM_Status ipmi_kfwum_checkfwcompat(tKFWUM_BoardInfo boardInfo,
tKFWUM_InFirmwareInfo firmInfo); tKFWUM_InFirmwareInfo firmInfo);
void printf_kfwum_info(tKFWUM_BoardInfo boardInfo, void printf_kfwum_info(tKFWUM_BoardInfo boardInfo,
@ -222,7 +222,7 @@ ipmi_fwum_main(struct ipmi_intf *intf, int argc, char **argv)
rc = KfwumMain(intf, KFWUM_TASK_START_UPGRADE); rc = KfwumMain(intf, KFWUM_TASK_START_UPGRADE);
} }
} else if (strncmp(argv[0], "tracelog", 8) == 0) { } else if (strncmp(argv[0], "tracelog", 8) == 0) {
rc = KfwumMain(intf, KFWUM_TASK_TRACELOG); rc = KfwumGetTraceLog(intf);
} else { } else {
lprintf(LOG_ERR, "Invalid KFWUM command: %s", argv[0]); lprintf(LOG_ERR, "Invalid KFWUM command: %s", argv[0]);
printf_kfwum_help(); printf_kfwum_help();
@ -354,9 +354,6 @@ KfwumMain(struct ipmi_intf *intf, tKFWUM_Task task)
|| (task == KFWUM_TASK_START_UPGRADE))) { || (task == KFWUM_TASK_START_UPGRADE))) {
status = KfwumStartFirmwareUpgrade(intf); status = KfwumStartFirmwareUpgrade(intf);
} }
if ((status == KFWUM_STATUS_OK) && (task == KFWUM_TASK_TRACELOG)) {
status = KfwumGetTraceLog(intf);
}
if (status == KFWUM_STATUS_OK) { if (status == KFWUM_STATUS_OK) {
return 0; return 0;
} }
@ -1156,10 +1153,10 @@ static const char* CMD_STATE_STRING[] = {
"Completed" "Completed"
}; };
static tKFWUM_Status int
KfwumGetTraceLog(struct ipmi_intf *intf) KfwumGetTraceLog(struct ipmi_intf *intf)
{ {
tKFWUM_Status status = KFWUM_STATUS_OK; int rc = 0;
struct ipmi_rs *rsp; struct ipmi_rs *rsp;
struct ipmi_rq req; struct ipmi_rq req;
unsigned char chunkIdx; unsigned char chunkIdx;
@ -1169,7 +1166,7 @@ KfwumGetTraceLog(struct ipmi_intf *intf)
} }
for (chunkIdx = 0; for (chunkIdx = 0;
(chunkIdx < TRACE_LOG_CHUNK_COUNT) (chunkIdx < TRACE_LOG_CHUNK_COUNT)
&& (status == KFWUM_STATUS_OK); && (rc == 0);
chunkIdx++) { chunkIdx++) {
/* Retreive each log chunk and print it */ /* Retreive each log chunk and print it */
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
@ -1182,13 +1179,13 @@ KfwumGetTraceLog(struct ipmi_intf *intf)
if (rsp == NULL) { if (rsp == NULL) {
lprintf(LOG_ERR, lprintf(LOG_ERR,
"Error in FWUM Firmware Get Trace Log Command"); "Error in FWUM Firmware Get Trace Log Command");
status = KFWUM_STATUS_ERROR; rc = (-1);
break; break;
} else if (rsp->ccode) { } else if (rsp->ccode) {
lprintf(LOG_ERR, lprintf(LOG_ERR,
"FWUM Firmware Get Trace Log returned %x", "FWUM Firmware Get Trace Log returned %x",
rsp->ccode); rsp->ccode);
status = KFWUM_STATUS_ERROR; rc = (-1);
break; break;
} }
for (cmdIdx=0; cmdIdx < TRACE_LOG_CHUNK_SIZE; cmdIdx++) { for (cmdIdx=0; cmdIdx < TRACE_LOG_CHUNK_SIZE; cmdIdx++) {
@ -1209,7 +1206,7 @@ KfwumGetTraceLog(struct ipmi_intf *intf)
} }
} }
printf("\n"); printf("\n");
return status; return rc;
} }
tKFWUM_Status tKFWUM_Status