diff options
| author | Keir Fraser <keir@xen.org> | 2011-01-14 09:52:02 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2011-01-14 09:52:02 +0000 |
| commit | 2d87af888ff25608e5a09d6d6eb3f1c292051a89 (patch) | |
| tree | 382999eceb51aedf54247df22574503e8a327d7b | |
| parent | 835e8cf959f4a6537374c3cf9cd43ff9fb35e500 (diff) | |
| download | xen-2d87af888ff25608e5a09d6d6eb3f1c292051a89.tar.gz xen-2d87af888ff25608e5a09d6d6eb3f1c292051a89.tar.bz2 xen-2d87af888ff25608e5a09d6d6eb3f1c292051a89.zip | |
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@xen.org>
| -rw-r--r-- | xen/arch/ia64/xen/xensetup.c | 6 | ||||
| -rw-r--r-- | xen/arch/x86/setup.c | 6 | ||||
| -rw-r--r-- | xen/common/cpu.c | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c index 9b3e725032..fe042e450a 100644 --- a/xen/arch/ia64/xen/xensetup.c +++ b/xen/arch/ia64/xen/xensetup.c @@ -606,7 +606,11 @@ printk("num_online_cpus=%d, max_cpus=%d\n",num_online_cpus(),max_cpus); 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 --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index d6f9e11f59..4bce2f4739 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1246,7 +1246,11 @@ void __init __start_xen(unsigned long mbi_p) 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 --git a/xen/common/cpu.c b/xen/common/cpu.c index 2a248275a2..5cdfd0fb10 100644 --- a/xen/common/cpu.c +++ b/xen/common/cpu.c @@ -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; } |