cpu: Quieten normal CPU hotplug operations.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c
index c62f122882903a62d162cee03cfc2267e6647689..4eb9e3025422ddc290fbc3bcaadc6e8db9e1ac1f 100644 (file)
--- a/xen/arch/x86/acpi/power.c
+++ b/xen/arch/x86/acpi/power.c
@@ -135,7 +135,7 @@ static int enter_state(u32 state)
     if ( !spin_trylock(&pm_lock) )
         return -EBUSY;
 
-    printk(XENLOG_INFO "Preparing system for ACPI S%d state.", state);
+    printk(XENLOG_INFO "Preparing system for ACPI S%d state.\n", state);
 
     freeze_domains();
 

diff --git a/xen/common/cpu.c b/xen/common/cpu.c
index 82a111de98f72b93433ce01d4c750d66cb95c3c3..4dfc3351b93b086adbb20a28d110a67734c3e98d 100644 (file)
--- a/xen/common/cpu.c
+++ b/xen/common/cpu.c
@@ -85,8 +85,6 @@ int cpu_down(unsigned int cpu)
         return -EINVAL;
     }
 
-    printk("Prepare to bring CPU%d down...\n", cpu);
-
     notifier_rc = __raw_notifier_call_chain(
         &cpu_chain, CPU_DOWN_PREPARE, hcpu, -1, &nr_calls);
     if ( notifier_rc != NOTIFY_DONE )
@@ -115,14 +113,9 @@ int cpu_down(unsigned int cpu)
 
  out:
     if ( !err )
-    {
-        printk("CPU %u is now offline\n", cpu);
         send_guest_global_virq(dom0, VIRQ_PCPU_STATE);
-    }
     else
-    {
         printk("Failed to take down CPU %u (error %d)\n", cpu, err);
-    }
     cpu_hotplug_done();
     return err;
 }
@@ -195,7 +188,6 @@ int disable_nonboot_cpus(void)
         }
 
         cpu_set(cpu, frozen_cpus);
-        printk("CPU%d is down\n", cpu);
     }
 
     BUG_ON(!error && (num_online_cpus() != 1));
@@ -214,9 +206,7 @@ void enable_nonboot_cpus(void)
         {
             BUG_ON(error == -EBUSY);
             printk("Error taking CPU%d up: %d\n", cpu, error);
-            continue;
         }
-        printk("CPU%d is up\n", cpu);
     }
 
     cpus_clear(frozen_cpus);