Patchwork [1/3] dmi_decode: report chassis types with 0x prefix since they are in hex

login
register
mail settings
Submitter Colin King
Date July 6, 2012, 2:30 p.m.
Message ID <1341585020-24134-2-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/169477/
State Accepted
Headers show

Comments

Colin King - July 6, 2012, 2:30 p.m.
From: Colin Ian King <colin.king@canonical.com>

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/dmi/dmi_decode/dmi_decode.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Keng-Yu Lin - July 9, 2012, 8:03 a.m.
On Fri, Jul 6, 2012 at 10:30 PM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  src/dmi/dmi_decode/dmi_decode.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/dmi/dmi_decode/dmi_decode.c b/src/dmi/dmi_decode/dmi_decode.c
> index 0a2f112..f8c37ed 100644
> --- a/src/dmi/dmi_decode/dmi_decode.c
> +++ b/src/dmi/dmi_decode/dmi_decode.c
> @@ -363,7 +363,7 @@ static void dmi_decode_entry(fwts_framework *fw,
>                                 (sizeof(fwts_acpi_pm_profile_type) / sizeof(fwts_chassis_type_map))) {
>                                 fwts_failed(fw, LOG_LEVEL_HIGH, DMI_INVALID_HARDWARE_ENTRY,
>                                         "Incorrect Chassis Type "
> -                                       "ACPI FACP reports %x",
> +                                       "ACPI FACP reports 0x%x",
>                                         fadt->preferred_pm_profile);
>                                 break;
>                         }
> @@ -371,7 +371,7 @@ static void dmi_decode_entry(fwts_framework *fw,
>                                 (sizeof(fwts_dmi_chassis_type) / sizeof(fwts_chassis_type_map))) {
>                                 fwts_failed(fw, LOG_LEVEL_HIGH, DMI_INVALID_HARDWARE_ENTRY,
>                                         "Incorrect Chassis Type "
> -                                       "SMBIOS Type 3 reports %x ",
> +                                       "SMBIOS Type 3 reports 0x%x ",
>                                         data[5]);
>                                 break;
>                         }
> @@ -379,8 +379,8 @@ static void dmi_decode_entry(fwts_framework *fw,
>                             fwts_dmi_chassis_type[data[5]].mapped)) {
>                                 fwts_failed(fw, LOG_LEVEL_HIGH, DMI_INVALID_HARDWARE_ENTRY,
>                                         "Unmatched Chassis Type "
> -                                       "SMBIOS Type 3 reports %x "
> -                                       "ACPI FACP reports %x",
> +                                       "SMBIOS Type 3 reports 0x%x "
> +                                       "ACPI FACP reports 0x%x",
>                                         data[5],
>                                         fadt->preferred_pm_profile);
>                         }
> --
> 1.7.10.4
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>
Ivan Hu - July 9, 2012, 9:03 a.m.
On 07/06/2012 10:30 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/dmi/dmi_decode/dmi_decode.c |    8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/dmi/dmi_decode/dmi_decode.c b/src/dmi/dmi_decode/dmi_decode.c
> index 0a2f112..f8c37ed 100644
> --- a/src/dmi/dmi_decode/dmi_decode.c
> +++ b/src/dmi/dmi_decode/dmi_decode.c
> @@ -363,7 +363,7 @@ static void dmi_decode_entry(fwts_framework *fw,
>   				(sizeof(fwts_acpi_pm_profile_type) / sizeof(fwts_chassis_type_map))) {
>   				fwts_failed(fw, LOG_LEVEL_HIGH, DMI_INVALID_HARDWARE_ENTRY,
>   					"Incorrect Chassis Type "
> -					"ACPI FACP reports %x",
> +					"ACPI FACP reports 0x%x",
>   					fadt->preferred_pm_profile);
>   				break;
>   			}
> @@ -371,7 +371,7 @@ static void dmi_decode_entry(fwts_framework *fw,
>   				(sizeof(fwts_dmi_chassis_type) / sizeof(fwts_chassis_type_map))) {
>   				fwts_failed(fw, LOG_LEVEL_HIGH, DMI_INVALID_HARDWARE_ENTRY,
>   					"Incorrect Chassis Type "
> -					"SMBIOS Type 3 reports %x ",
> +					"SMBIOS Type 3 reports 0x%x ",
>   					data[5]);
>   				break;
>   			}
> @@ -379,8 +379,8 @@ static void dmi_decode_entry(fwts_framework *fw,
>   			    fwts_dmi_chassis_type[data[5]].mapped)) {
>   				fwts_failed(fw, LOG_LEVEL_HIGH, DMI_INVALID_HARDWARE_ENTRY,
>   					"Unmatched Chassis Type "
> -					"SMBIOS Type 3 reports %x "
> -					"ACPI FACP reports %x",
> +					"SMBIOS Type 3 reports 0x%x "
> +					"ACPI FACP reports 0x%x",
>   					data[5],
>   					fadt->preferred_pm_profile);
>   			}
>

Acked-by: Ivan Hu<ivan.hu@canonical.com>

Patch

diff --git a/src/dmi/dmi_decode/dmi_decode.c b/src/dmi/dmi_decode/dmi_decode.c
index 0a2f112..f8c37ed 100644
--- a/src/dmi/dmi_decode/dmi_decode.c
+++ b/src/dmi/dmi_decode/dmi_decode.c
@@ -363,7 +363,7 @@  static void dmi_decode_entry(fwts_framework *fw,
 				(sizeof(fwts_acpi_pm_profile_type) / sizeof(fwts_chassis_type_map))) {
 				fwts_failed(fw, LOG_LEVEL_HIGH, DMI_INVALID_HARDWARE_ENTRY,
 					"Incorrect Chassis Type "
-					"ACPI FACP reports %x",
+					"ACPI FACP reports 0x%x",
 					fadt->preferred_pm_profile);
 				break;
 			}
@@ -371,7 +371,7 @@  static void dmi_decode_entry(fwts_framework *fw,
 				(sizeof(fwts_dmi_chassis_type) / sizeof(fwts_chassis_type_map))) {
 				fwts_failed(fw, LOG_LEVEL_HIGH, DMI_INVALID_HARDWARE_ENTRY,
 					"Incorrect Chassis Type "
-					"SMBIOS Type 3 reports %x ",
+					"SMBIOS Type 3 reports 0x%x ",
 					data[5]);
 				break;
 			}
@@ -379,8 +379,8 @@  static void dmi_decode_entry(fwts_framework *fw,
 			    fwts_dmi_chassis_type[data[5]].mapped)) {
 				fwts_failed(fw, LOG_LEVEL_HIGH, DMI_INVALID_HARDWARE_ENTRY,
 					"Unmatched Chassis Type "
-					"SMBIOS Type 3 reports %x "
-					"ACPI FACP reports %x",
+					"SMBIOS Type 3 reports 0x%x "
+					"ACPI FACP reports 0x%x",
 					data[5],
 					fadt->preferred_pm_profile);
 			}