x86/idle: don't mix up ACPI and APIC IDs

Correct a log message and, to clarify code as well, rename the
respective function parameter too.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c
index 7ecf4435622aafcd6c2d0f29bbb2d8ab16764846..f26d6943622b713086568a81742534419e3cb820 100644 (file)
--- a/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c
@@ -1172,7 +1172,7 @@ static void print_cx_pminfo(uint32_t cpu, struct xen_processor_power *power)
 #define print_cx_pminfo(c, p)
 #endif
 
-long set_cx_pminfo(uint32_t cpu, struct xen_processor_power *power)
+long set_cx_pminfo(uint32_t acpi_id, struct xen_processor_power *power)
 {
     XEN_GUEST_HANDLE(xen_processor_cx_t) states;
     xen_processor_cx_t xen_cx;
@@ -1185,16 +1185,15 @@ long set_cx_pminfo(uint32_t cpu, struct xen_processor_power *power)
     if ( pm_idle_save && pm_idle != acpi_processor_idle )
         return 0;
 
-    print_cx_pminfo(cpu, power);
+    print_cx_pminfo(acpi_id, power);
 
-    /* map from acpi_id to cpu_id */
-    cpu_id = get_cpu_id(cpu);
+    cpu_id = get_cpu_id(acpi_id);
     if ( cpu_id == -1 )
     {
         static bool warn_once = true;
 
         if ( warn_once || opt_cpu_info )
-            printk(XENLOG_WARNING "No CPU ID for APIC ID %#x\n", cpu);
+            printk(XENLOG_WARNING "No CPU for ACPI ID %#x\n", acpi_id);
         warn_once = false;
         return -EINVAL;
     }