ID: 70 - Fixes and updates for ipmitool hpm

We now will print the decoded strings as well as the error value for
error response codes from the target.

Commit for Dan Gora
This commit is contained in:
Zdenek Styblik 2013-07-17 10:42:19 +00:00
parent e56e914866
commit 6d89531096

View File

@ -2661,7 +2661,10 @@ int HpmfwupgGetDeviceId(struct ipmi_intf *intf, struct ipm_devid_rsp* pGetDevId)
} }
else else
{ {
lprintf(LOG_NOTICE,"Error getting device ID, compcode = %x\n", rsp->ccode); lprintf(LOG_NOTICE,"Error getting device ID");
lprintf(LOG_NOTICE,"compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode, completion_code_vals));
rc = HPMFWUPG_ERROR; rc = HPMFWUPG_ERROR;
} }
} }
@ -2863,7 +2866,10 @@ int HpmfwupgGetComponentProperties(struct ipmi_intf *intf, struct HpmfwupgGetCom
} }
else else
{ {
lprintf(LOG_NOTICE,"Error getting component properties, compcode = %x\n", rsp->ccode); lprintf(LOG_NOTICE,"Error getting component properties");
lprintf(LOG_NOTICE,"compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode, completion_code_vals));
rc = HPMFWUPG_ERROR; rc = HPMFWUPG_ERROR;
} }
} }
@ -2897,7 +2903,10 @@ int HpmfwupgAbortUpgrade(struct ipmi_intf *intf, struct HpmfwupgAbortUpgradeCtx*
{ {
if ( rsp->ccode != 0x00 ) if ( rsp->ccode != 0x00 )
{ {
lprintf(LOG_NOTICE,"Error aborting upgrade, compcode = %x\n", rsp->ccode); lprintf(LOG_NOTICE,"Error aborting upgrade");
lprintf(LOG_NOTICE,"compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode, completion_code_vals));
rc = HPMFWUPG_ERROR; rc = HPMFWUPG_ERROR;
} }
} }
@ -2935,7 +2944,10 @@ int HpmfwupgInitiateUpgradeAction(struct ipmi_intf *intf, struct HpmfwupgInitiat
} }
else if ( rsp->ccode != 0x00 ) else if ( rsp->ccode != 0x00 )
{ {
lprintf(LOG_NOTICE,"Error initiating upgrade action, compcode = %x\n", rsp->ccode); lprintf(LOG_NOTICE,"Error initiating upgrade action");
lprintf(LOG_NOTICE,"compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode, completion_code_vals));
rc = HPMFWUPG_ERROR; rc = HPMFWUPG_ERROR;
} }
} }
@ -3028,7 +3040,10 @@ int HpmfwupgUploadFirmwareBlock(struct ipmi_intf *intf, struct HpmfwupgUploadFir
} }
else else
{ {
lprintf(LOG_NOTICE,"Error uploading firmware block, compcode = %x\n", rsp->ccode); lprintf(LOG_NOTICE,"Error uploading firmware block");
lprintf(LOG_NOTICE,"compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode, completion_code_vals));
rc = HPMFWUPG_ERROR; rc = HPMFWUPG_ERROR;
} }
} }
@ -3068,7 +3083,10 @@ int HpmfwupgFinishFirmwareUpload(struct ipmi_intf *intf, struct HpmfwupgFinishFi
} }
else if ( rsp->ccode != IPMI_CC_OK ) else if ( rsp->ccode != IPMI_CC_OK )
{ {
lprintf(LOG_NOTICE,"Error finishing firmware upload, compcode = %x\n", rsp->ccode); lprintf(LOG_NOTICE,"Error finishing firmware upload");
lprintf(LOG_NOTICE,"compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode, completion_code_vals));
rc = HPMFWUPG_ERROR; rc = HPMFWUPG_ERROR;
} }
} }
@ -3120,8 +3138,10 @@ int HpmfwupgActivateFirmware(struct ipmi_intf *intf, struct HpmfwupgActivateFirm
} }
else if ( rsp->ccode != IPMI_CC_OK ) else if ( rsp->ccode != IPMI_CC_OK )
{ {
lprintf(LOG_NOTICE,"Error activating firmware, compcode = %x\n", lprintf(LOG_NOTICE,"Error activating firmware");
rsp->ccode); lprintf(LOG_NOTICE,"compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode, completion_code_vals));
rc = HPMFWUPG_ERROR; rc = HPMFWUPG_ERROR;
} }
} }
@ -3178,7 +3198,10 @@ int HpmfwupgGetUpgradeStatus(struct ipmi_intf *intf, struct HpmfwupgGetUpgradeSt
{ {
if ( verbose ) if ( verbose )
{ {
lprintf(LOG_NOTICE,"Error getting upgrade status, compcode = %x\n", rsp->ccode); lprintf(LOG_NOTICE,"Error getting upgrade status");
lprintf(LOG_NOTICE,"compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode, completion_code_vals));
rc = HPMFWUPG_ERROR; rc = HPMFWUPG_ERROR;
} }
} }
@ -3224,7 +3247,10 @@ int HpmfwupgManualFirmwareRollback(struct ipmi_intf *intf, struct HpmfwupgManual
} }
else if ( rsp->ccode != 0x00 ) else if ( rsp->ccode != 0x00 )
{ {
lprintf(LOG_NOTICE,"Error sending manual rollback, compcode = %x\n", rsp->ccode); lprintf(LOG_NOTICE,"Error sending manual rollback");
lprintf(LOG_NOTICE,"compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode, completion_code_vals));
rc = HPMFWUPG_ERROR; rc = HPMFWUPG_ERROR;
} }
} }
@ -3328,7 +3354,10 @@ int HpmfwupgQueryRollbackStatus(struct ipmi_intf *intf, struct HpmfwupgQueryRoll
} }
else else
{ {
lprintf(LOG_NOTICE,"Error getting rollback status, compcode = %x", rsp->ccode); lprintf(LOG_NOTICE,"Error getting rollback status");
lprintf(LOG_NOTICE,"compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode, completion_code_vals));
rc = HPMFWUPG_ERROR; rc = HPMFWUPG_ERROR;
} }
} }
@ -3415,7 +3444,10 @@ int HpmfwupgQuerySelftestResult(struct ipmi_intf *intf, struct HpmfwupgQuerySelf
} }
else else
{ {
lprintf(LOG_NOTICE,"Error getting self test results, compcode = %x\n", rsp->ccode); lprintf(LOG_NOTICE,"Error getting self test results");
lprintf(LOG_NOTICE,"compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode, completion_code_vals));
rc = HPMFWUPG_ERROR; rc = HPMFWUPG_ERROR;
} }
} }