# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1294998722 0
# Node ID ff97273750b8381062d81d1b9c72b4ccc43011c9
# Parent 58304c1cc725e6ef5947aded0bee3b11f0a0dd4e
cpu hotplug: Core functions are quiet on failure.
This was already inconsistent, so make them consistently quiet and
leave it to callers to log an error. Add suitable error logging to the
arch-specific CPU bringup loops,
In particular this avoids printing error on EBUSY, in which case
caller may want a silent retry loop.
Signed-off-by: Keir Fraser <keir@xxxxxxx>
---
xen/arch/ia64/xen/xensetup.c | 6 +++++-
xen/arch/x86/setup.c | 6 +++++-
xen/common/cpu.c | 2 --
3 files changed, 10 insertions(+), 4 deletions(-)
diff -r 58304c1cc725 -r ff97273750b8 xen/arch/ia64/xen/xensetup.c
--- a/xen/arch/ia64/xen/xensetup.c Fri Jan 14 09:11:28 2011 +0000
+++ b/xen/arch/ia64/xen/xensetup.c Fri Jan 14 09:52:02 2011 +0000
@@ -606,7 +606,11 @@ printk("num_online_cpus=%d, max_cpus=%d\
if ( num_online_cpus() >= max_cpus )
break;
if ( !cpu_online(i) )
- cpu_up(i);
+ {
+ int ret = cpu_up(i);
+ if ( ret != 0 )
+ printk("Failed to bring up CPU %u (error %d)\n", i, ret);
+ }
}
local_irq_disable();
diff -r 58304c1cc725 -r ff97273750b8 xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c Fri Jan 14 09:11:28 2011 +0000
+++ b/xen/arch/x86/setup.c Fri Jan 14 09:52:02 2011 +0000
@@ -1246,7 +1246,11 @@ void __init __start_xen(unsigned long mb
numa_add_cpu(i);
if ( (num_online_cpus() < max_cpus) && !cpu_online(i) )
- cpu_up(i);
+ {
+ int ret = cpu_up(i);
+ if ( ret != 0 )
+ printk("Failed to bring up CPU %u (error %d)\n", i, ret);
+ }
}
printk("Brought up %ld CPUs\n", (long)num_online_cpus());
diff -r 58304c1cc725 -r ff97273750b8 xen/common/cpu.c
--- a/xen/common/cpu.c Fri Jan 14 09:11:28 2011 +0000
+++ b/xen/common/cpu.c Fri Jan 14 09:52:02 2011 +0000
@@ -108,7 +108,6 @@ int cpu_down(unsigned int cpu)
fail:
notifier_rc = notifier_call_chain(&cpu_chain, CPU_DOWN_FAILED, hcpu, &nb);
BUG_ON(notifier_rc != NOTIFY_DONE);
- printk("Failed to take down CPU %u (error %d)\n", cpu, err);
cpu_hotplug_done();
return err;
}
@@ -150,7 +149,6 @@ int cpu_up(unsigned int cpu)
fail:
notifier_rc = notifier_call_chain(&cpu_chain, CPU_UP_CANCELED, hcpu, &nb);
BUG_ON(notifier_rc != NOTIFY_DONE);
- printk("Failed to bring up CPU %u (error %d)\n", cpu, err);
cpu_hotplug_done();
return err;
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home