diff options
author | Keir Fraser <keir@xen.org> | 2010-12-15 12:04:34 +0000 |
---|---|---|
committer | Keir Fraser <keir@xen.org> | 2010-12-15 12:04:34 +0000 |
commit | e1d4636fef0bd962a70f2b1b38a7b2dd4810c378 (patch) | |
tree | 5dcf9925cc523d83ddc92bfc139775213968e7ae /xen/common/keyhandler.c | |
parent | 18a803be99a6bda4a5642a8191aa028968d40b0c (diff) | |
download | xen-e1d4636fef0bd962a70f2b1b38a7b2dd4810c378.tar.gz xen-e1d4636fef0bd962a70f2b1b38a7b2dd4810c378.tar.bz2 xen-e1d4636fef0bd962a70f2b1b38a7b2dd4810c378.zip |
Reduce side effects of handling '*' debug key
NMI watchdog should be suppressed when dumping IRQ handlers. Softirqs
should be handled periodically while processing non-IRQ handlers.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'xen/common/keyhandler.c')
-rw-r--r-- | xen/common/keyhandler.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index f05bde01ff..81c65fd697 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -444,16 +444,15 @@ static void run_all_nonirq_keyhandlers(unsigned long unused) struct keyhandler *h; int k; - console_start_log_everything(); for ( k = 0; k < ARRAY_SIZE(key_table); k++ ) { + process_pending_softirqs(); h = key_table[k]; if ( (h == NULL) || !h->diagnostic || h->irq_callback ) continue; printk("[%c: %s]\n", k, h->desc); (*h->u.fn)(k); } - console_end_log_everything(); } static DECLARE_TASKLET(run_all_keyhandlers_tasklet, @@ -464,10 +463,11 @@ static void run_all_keyhandlers(unsigned char key, struct cpu_user_regs *regs) struct keyhandler *h; int k; + watchdog_disable(); + printk("'%c' pressed -> firing all diagnostic keyhandlers\n", key); /* Fire all the IRQ-context diangostic keyhandlers now */ - console_start_log_everything(); for ( k = 0; k < ARRAY_SIZE(key_table); k++ ) { h = key_table[k]; @@ -476,7 +476,8 @@ static void run_all_keyhandlers(unsigned char key, struct cpu_user_regs *regs) printk("[%c: %s]\n", k, h->desc); (*h->u.irq_fn)(k, regs); } - console_end_log_everything(); + + watchdog_enable(); /* Trigger the others from a tasklet in non-IRQ context */ tasklet_schedule(&run_all_keyhandlers_tasklet); |