diff options
| author | cl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk> | 2004-11-15 15:33:15 +0000 |
|---|---|---|
| committer | cl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk> | 2004-11-15 15:33:15 +0000 |
| commit | fb6e5fad059e4dd66ccf88e86bd431bdc51e2980 (patch) | |
| tree | f7e84747ed2af1ae58a1806bab5914c4e2e9d810 | |
| parent | f3f7e94361503ba3e19556f3bf02007140c0789a (diff) | |
| parent | 58faa491519d028756992e15778bb2d97e82bf2f (diff) | |
| download | xen-fb6e5fad059e4dd66ccf88e86bd431bdc51e2980.tar.gz xen-fb6e5fad059e4dd66ccf88e86bd431bdc51e2980.tar.bz2 xen-fb6e5fad059e4dd66ccf88e86bd431bdc51e2980.zip | |
bitkeeper revision 1.1159.170.25 (4198cc3b-yQEJ6t2KXb0BZw64jh66Q)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-ddb
| -rw-r--r-- | xen/common/keyhandler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index d6eb85250b..a5cf77aa57 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -89,7 +89,7 @@ static void dump_registers(unsigned char key, struct xen_regs *regs) show_registers(regs); } -static void halt_machine(unsigned char key) +static void halt_machine(unsigned char key, struct xen_regs *regs) { printk("'%c' pressed -> rebooting machine\n", key); machine_restart(NULL); @@ -169,7 +169,7 @@ void initialize_keytable(void) 'q', do_task_queues, "dump task queues + guest state"); register_keyhandler( 'r', dump_runq, "dump run queues"); - register_keyhandler( + register_irq_keyhandler( 'R', halt_machine, "reboot machine"); #ifndef NDEBUG |