From: Keir Fraser Date: Tue, 16 Nov 2010 11:32:04 +0000 (+0000) Subject: Don't register shutdown watch and suspend event channel for Dom0 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=632df17e4e323d527cb63cfe2f7bc7e354f39e6c;p=legacy%2Flinux-2.6.18-xen.git Don't register shutdown watch and suspend event channel for Dom0 This pointlessly consumes resources and poses the risk of either getting triggered inadvertently. Signed-off-by: Jan Beulich --- diff --git a/drivers/xen/core/reboot.c b/drivers/xen/core/reboot.c index 20a0e9e5..51ae7d81 100644 --- a/drivers/xen/core/reboot.c +++ b/drivers/xen/core/reboot.c @@ -277,6 +277,15 @@ static int setup_shutdown_watcher(void) { int err; + err = register_xenbus_watch(&sysrq_watch); + if (err) { + printk(KERN_ERR "Failed to set sysrq watcher\n"); + return err; + } + + if (is_initial_xendomain()) + return 0; + xenbus_scanf(XBT_NIL, "control", "platform-feature-multiprocessor-suspend", "%d", &fast_suspend); @@ -287,12 +296,6 @@ static int setup_shutdown_watcher(void) return err; } - err = register_xenbus_watch(&sysrq_watch); - if (err) { - printk(KERN_ERR "Failed to set sysrq watcher\n"); - return err; - } - /* suspend event channel */ err = setup_suspend_evtchn(); if (err) {