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 
KfwumManualRollback() - code formatting, simplify
This commit is contained in:
Zdenek Styblik 2013-10-26 19:06:28 +00:00
parent 700658e91e
commit 0dddcfe450
1 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
ipmitool/lib/ipmi_fwum.c
View File

@ -821,44 +821,35 @@ struct KfwumManualRollbackReq{
/* KfwumManualRollback - Ask IPMC to rollback to previous version /* KfwumManualRollback - Ask IPMC to rollback to previous version
* *
* * intf : IPMI interface * *intf : IPMI interface
*
* returns KFWUM_STATUS_OK on success, otherwise KFWUM_STATUS_ERROR
*/ */
static tKFWUM_Status KfwumManualRollback(struct ipmi_intf * intf) static tKFWUM_Status KfwumManualRollback(struct ipmi_intf * intf)
{ {
tKFWUM_Status status = KFWUM_STATUS_OK; struct ipmi_rs * rsp;
struct ipmi_rs * rsp; struct ipmi_rq req;
struct ipmi_rq req; struct KfwumManualRollbackReq thisReq;
struct KfwumManualRollbackReq thisReq;
memset(&req, 0, sizeof(req));
req.msg.netfn = IPMI_NETFN_FIRMWARE;
req.msg.cmd = KFWUM_CMD_ID_MANUAL_ROLLBACK;
thisReq.type = 0; /* Wait BMC shutdown */
req.msg.data = (unsigned char *)&thisReq;
req.msg.data_len = 1;
memset(&req, 0, sizeof(req)); rsp = intf->sendrecv(intf, &req);
req.msg.netfn = IPMI_NETFN_FIRMWARE; if (rsp == NULL) {
req.msg.cmd = KFWUM_CMD_ID_MANUAL_ROLLBACK; lprintf(LOG_ERR, "Error in FWUM Manual Rollback Command.");
return KFWUM_STATUS_ERROR;
thisReq.type = 0; /* Wait BMC shutdown */ } else if (rsp->ccode != 0) {
lprintf(LOG_ERR,
req.msg.data = (unsigned char *) &thisReq; "Error in FWUM Manual Rollback Command returned %x",
req.msg.data_len = 1; rsp->ccode);
return KFWUM_STATUS_ERROR;
rsp = intf->sendrecv(intf, &req); }
printf("FWUM Starting Manual Rollback \n");
if (!rsp) return KFWUM_STATUS_OK;
{
printf("Error in FWUM Manual Rollback Command\n");
status = KFWUM_STATUS_ERROR;
}
else if (rsp->ccode)
{
printf("Error in FWUM Manual Rollback Command returned %x\n",
rsp->ccode);
status = KFWUM_STATUS_ERROR;
}
if(status == KFWUM_STATUS_OK)
{
printf("FWUM Starting Manual Rollback \n");
}
return status;
} }
#ifdef HAVE_PRAGMA_PACK #ifdef HAVE_PRAGMA_PACK