| author | henryzh <henry.zhao@oracle.com> |
| Mon, 21 Nov 2011 16:45:38 -0800 | |
| changeset 589 | beabcdec3918 |
| permissions | -rw-r--r-- |
|
589
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
1 |
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
2 |
|
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
3 |
--- ipmitool-1.8.11.old/lib/ipmi_fru.c Wed Feb 25 12:38:52 2009 |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
4 |
+++ ipmitool-1.8.11/lib/ipmi_fru.c Thu Oct 27 12:28:57 2011 |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
5 |
@@ -1310,12 +1310,20 @@ |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
6 |
printf (" Peak capacity holdup : %d s\n",
|
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
7 |
peak_hold_up_time); |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
8 |
if (ps->combined_capacity == 0) |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
9 |
- printf (" Combined capacity : not specified\n");
|
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
10 |
- else |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
11 |
- printf (" Combined capacity : %d W (%s and %s)\n",
|
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
12 |
- ps->combined_capacity, |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
13 |
- combined_voltage_desc [ps->combined_voltage1], |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
14 |
- combined_voltage_desc [ps->combined_voltage2]); |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
15 |
+ printf (" Combined capacity : not specified\n");
|
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
16 |
+ else {
|
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
17 |
+ if ((ps->combined_voltage1 < |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
18 |
+ sizeof(combined_voltage_desc)/sizeof(char *)) && |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
19 |
+ (ps->combined_voltage2 < |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
20 |
+ sizeof(combined_voltage_desc)/sizeof(char *))) |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
21 |
+ printf (" Combined capacity : %d W (%s and %s)\n",
|
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
22 |
+ ps->combined_capacity, |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
23 |
+ combined_voltage_desc [ps->combined_voltage1], |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
24 |
+ combined_voltage_desc [ps->combined_voltage2]); |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
25 |
+ else |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
26 |
+ printf (" Combined capacity : %d W (voltages not specified correctly)\n",
|
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
27 |
+ ps->combined_capacity); |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
28 |
+ } |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
29 |
if (ps->predictive_fail) |
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
30 |
printf (" Fan lower threshold : %d RPS\n",
|
|
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff
changeset
|
31 |
ps->rps_threshold); |