tools/power/x86/intel-speed-select: Display CPU as None for -1

When there is no CPU in a power domain, display "None" instead of -1.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/tools/power/x86/intel-speed-select/isst-display.c b/tools/power/x86/intel-speed-select/isst-display.c
index e30f6355e417ebd117e2d3b118f21e7e76d1f68a..07ebd08f32026e096880aa8b9fe0e9653c53fe4f 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-display.c
+++ b/tools/power/x86/intel-speed-select/isst-display.c
@@ -172,12 +172,19 @@ static int print_package_info(struct isst_id *id, FILE *outf)
        int level = 1;
 
        if (out_format_is_json()) {
-               if (api_version() > 1)
-                       snprintf(header, sizeof(header), "package-%d:die-%d:powerdomain-%d:cpu-%d",
-                                id->pkg, id->die, id->punit, id->cpu);
-               else
+               if (api_version() > 1) {
+                       if (id->cpu < 0)
+                               snprintf(header, sizeof(header),
+                                        "package-%d:die-%d:powerdomain-%d:cpu-None",
+                                        id->pkg, id->die, id->punit);
+                       else
+                               snprintf(header, sizeof(header),
+                                        "package-%d:die-%d:powerdomain-%d:cpu-%d",
+                                        id->pkg, id->die, id->punit, id->cpu);
+               } else {
                        snprintf(header, sizeof(header), "package-%d:die-%d:cpu-%d",
                                 id->pkg, id->die, id->cpu);
+               }
                format_and_print(outf, level, header, NULL);
                return 1;
        }
@@ -189,7 +196,12 @@ static int print_package_info(struct isst_id *id, FILE *outf)
                snprintf(header, sizeof(header), "powerdomain-%d", id->punit);
                format_and_print(outf, level++, header, NULL);
        }
-       snprintf(header, sizeof(header), "cpu-%d", id->cpu);
+
+       if (id->cpu < 0)
+               snprintf(header, sizeof(header), "cpu-None");
+       else
+               snprintf(header, sizeof(header), "cpu-%d", id->cpu);
+
        format_and_print(outf, level, header, NULL);
 
        return level;