[Xen-changelog] [xen staging] xen/x86: Use %*pb[l] instead of cpumask_scn{, list}printf()

[p***@xen.org]

commit ad63707307f27bc4d5ab1ef0e7641a596bb8bb4c
Author: Andrew Cooper <***@citrix.com>
AuthorDate: Thu Sep 6 11:21:51 2018 +0000
Commit: Andrew Cooper <***@citrix.com>
CommitDate: Fri Nov 16 16:25:54 2018 +0000

xen/x86: Use %*pb[l] instead of cpumask_scn{,list}printf()

This removes all use of keyhandler_scratch as a bounce-buffer for the rendered
string.

No functional change.

Signed-off-by: Andrew Cooper <***@citrix.com>
Reviewed-by: Wei Liu <***@citrix.com>
Reviewed-by: Jan Beulich <***@suse.com>
---
xen/arch/x86/cpu/mcheck/mce.c | 9 ++++++---
xen/arch/x86/crash.c | 7 ++-----
xen/arch/x86/irq.c | 7 ++-----
3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c
index 1eec6319ca..30cdb06401 100644
--- a/xen/arch/x86/cpu/mcheck/mce.c
+++ b/xen/arch/x86/cpu/mcheck/mce.c
@@ -535,9 +535,12 @@ void mcheck_cmn_handler(const struct cpu_user_regs *regs)
mc_panic("MCE: No CPU found valid MCE, need reset");
if ( !cpumask_empty(&mce_fatal_cpus) )
{
- char *ebufp, ebuf[96] = "MCE: Fatal error happened on CPUs ";
- ebufp = ebuf + strlen(ebuf);
- cpumask_scnprintf(ebufp, 95 - strlen(ebuf), &mce_fatal_cpus);
+ char ebuf[96];
+
+ snprintf(ebuf, sizeof(ebuf),
+ "MCE: Fatal error happened on CPUs %*pb",
+ nr_cpu_ids, cpumask_bits(&mce_fatal_cpus));
+
mc_panic(ebuf);
}
atomic_set(&found_error, 0);
diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c
index 8d742582af..60c98b6175 100644
--- a/xen/arch/x86/crash.c
+++ b/xen/arch/x86/crash.c
@@ -159,11 +159,8 @@ static void nmi_shootdown_cpus(void)
if ( cpumask_empty(&waiting_to_crash) )
printk("Shot down all CPUs\n");
else
- {
- cpulist_scnprintf(keyhandler_scratch, sizeof keyhandler_scratch,
- &waiting_to_crash);
- printk("Failed to shoot down CPUs {%s}\n", keyhandler_scratch);
- }
+ printk("Failed to shoot down CPUs {%*pbl}\n",
+ nr_cpu_ids, cpumask_bits(&waiting_to_crash));

/* Crash shutdown any IOMMU functionality as the crashdump kernel is not
* happy when booting if interrupt/dma remapping is still enabled */
diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 35e7de594f..8b44d6ce0b 100644
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -2302,11 +2302,8 @@ static void dump_irqs(unsigned char key)

spin_lock_irqsave(&desc->lock, flags);

- cpumask_scnprintf(keyhandler_scratch, sizeof(keyhandler_scratch),
- desc->affinity);
- printk(" IRQ:%4d affinity:%s vec:%02x type=%-15s"
- " status=%08x ",
- irq, keyhandler_scratch, desc->arch.vector,
+ printk(" IRQ:%4d affinity:%*pb vec:%02x type=%-15s status=%08x ",
+ irq, nr_cpu_ids, cpumask_bits(desc->affinity), desc->arch.vector,
desc->handler->typename, desc->status);

if ( ssid )
--
generated by git-patchbot for /home/xen/git/xen.git#staging