We now will print the decoded strings as well as the error value for
error response codes from the target.
Signed-off-by: Dan Gora <d...@adax.com>
---
ipmitool/lib/ipmi_hpmfwupg.c | 60 ++++++++++++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/ipmitool/lib/ipmi_hpmfwupg.c b/ipmitool/lib/ipmi_hpmfwupg.c
index 9573c86..9a2711f 100644
--- a/ipmitool/lib/ipmi_hpmfwupg.c
+++ b/ipmitool/lib/ipmi_hpmfwupg.c
@@ -2656,7 +2656,10 @@ int HpmfwupgGetDeviceId(struct ipmi_intf *intf, struct
ipm_devid_rsp* pGetDevId)
}
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;
}
}
@@ -2858,7 +2861,10 @@ int HpmfwupgGetComponentProperties(struct ipmi_intf
*intf, struct HpmfwupgGetCom
}
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;
}
}
@@ -2892,7 +2898,10 @@ int HpmfwupgAbortUpgrade(struct ipmi_intf *intf, struct
HpmfwupgAbortUpgradeCtx*
{
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;
}
}
@@ -2930,7 +2939,10 @@ int HpmfwupgInitiateUpgradeAction(struct ipmi_intf
*intf, struct HpmfwupgInitiat
}
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;
}
}
@@ -3023,7 +3035,10 @@ int HpmfwupgUploadFirmwareBlock(struct ipmi_intf *intf,
struct HpmfwupgUploadFir
}
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;
}
}
@@ -3063,7 +3078,10 @@ int HpmfwupgFinishFirmwareUpload(struct ipmi_intf *intf,
struct HpmfwupgFinishFi
}
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;
}
}
@@ -3115,9 +3133,11 @@ int HpmfwupgActivateFirmware(struct ipmi_intf *intf,
struct HpmfwupgActivateFirm
}
else if ( rsp->ccode != IPMI_CC_OK )
{
- lprintf(LOG_NOTICE,"Error activating firmware, compcode = %x\n",
- rsp->ccode);
- rc = HPMFWUPG_ERROR;
+ lprintf(LOG_NOTICE,"Error activating firmware");
+ lprintf(LOG_NOTICE,"compcode=0x%x: %s",
+ rsp->ccode,
+ val2str(rsp->ccode, completion_code_vals));
+ rc = HPMFWUPG_ERROR;
}
}
else
@@ -3173,8 +3193,11 @@ int HpmfwupgGetUpgradeStatus(struct ipmi_intf *intf,
struct HpmfwupgGetUpgradeSt
{
if ( verbose )
{
- lprintf(LOG_NOTICE,"Error getting upgrade status, compcode =
%x\n", rsp->ccode);
- rc = HPMFWUPG_ERROR;
+ 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;
}
}
}
@@ -3219,7 +3242,10 @@ int HpmfwupgManualFirmwareRollback(struct ipmi_intf
*intf, struct HpmfwupgManual
}
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;
}
}
@@ -3323,7 +3349,10 @@ int HpmfwupgQueryRollbackStatus(struct ipmi_intf *intf,
struct HpmfwupgQueryRoll
}
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;
}
}
@@ -3410,7 +3439,10 @@ int HpmfwupgQuerySelftestResult(struct ipmi_intf *intf,
struct HpmfwupgQuerySelf
}
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;
}
}
--
1.7.7
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Ipmitool-devel mailing list
Ipmitool-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipmitool-devel
