From 5b08fc106d3146ddc1447d82d4770fc402fc363b Mon Sep 17 00:00:00 2001 From: aliguori Date: Thu, 21 Aug 2008 20:08:03 +0000 Subject: [PATCH] Handle terminating signals (Gerd Hoffmann) This patch makes qemu handle signals better. It sets the request_shutdown flag, making the main_loop exit and qemu taking the usual exit route, with atexit handlers being called and so on, instead of qemu just being killed by the signal. To avoid calling vm_start() from the signal handler main_loop() got an additional check so qemu_system_shutdown_request() works even when the vm is in stopped state. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5055 c046a42c-6fe2-441c-8c8c-71466251a162 --- curses.c | 2 -- sdl.c | 9 +-------- vl.c | 27 +++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/curses.c b/curses.c index d09eff2..96b6e49 100644 --- a/curses.c +++ b/curses.c @@ -350,8 +350,6 @@ void curses_display_init(DisplayState *ds, int full_screen) atexit(curses_atexit); #ifndef _WIN32 - signal(SIGINT, SIG_DFL); - signal(SIGQUIT, SIG_DFL); #if defined(SIGWINCH) && defined(KEY_RESIZE) /* some curses implementations provide a handler, but we * want to be sure this is handled regardless of the library */ diff --git a/sdl.c b/sdl.c index 0edc4a0..84a9d6d 100644 --- a/sdl.c +++ b/sdl.c @@ -476,10 +476,8 @@ static void sdl_refresh(DisplayState *ds) sdl_process_key(&ev->key); break; case SDL_QUIT: - if (!no_quit) { + if (!no_quit) qemu_system_shutdown_request(); - vm_start(); /* In case we're paused */ - } break; case SDL_MOUSEMOTION: if (gui_grab || kbd_mouse_is_absolute() || @@ -636,11 +634,6 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) fprintf(stderr, "Could not initialize SDL - exiting\n"); exit(1); } -#ifndef _WIN32 - /* NOTE: we still want Ctrl-C to work, so we undo the SDL redirections */ - signal(SIGINT, SIG_DFL); - signal(SIGQUIT, SIG_DFL); -#endif ds->dpy_update = sdl_update; ds->dpy_resize = sdl_resize; diff --git a/vl.c b/vl.c index a4838b4..df7b7a6 100644 --- a/vl.c +++ b/vl.c @@ -7621,6 +7621,8 @@ static int main_loop(void) timeout = 0; } } else { + if (shutdown_requested) + break; timeout = 10; } #ifdef CONFIG_PROFILER @@ -8185,6 +8187,26 @@ static BOOL WINAPI qemu_ctrl_handler(DWORD type) #define MAX_NET_CLIENTS 32 +#ifndef _WIN32 + +static void termsig_handler(int signal) +{ + qemu_system_shutdown_request(); +} + +void termsig_setup(void) +{ + struct sigaction act; + + memset(&act, 0, sizeof(act)); + act.sa_handler = termsig_handler; + sigaction(SIGINT, &act, NULL); + sigaction(SIGHUP, &act, NULL); + sigaction(SIGTERM, &act, NULL); +} + +#endif + int main(int argc, char **argv) { #ifdef CONFIG_GDBSTUB @@ -9073,6 +9095,11 @@ int main(int argc, char **argv) #endif } +#ifndef _WIN32 + /* must be after terminal init, SDL library changes signal handlers */ + termsig_setup(); +#endif + /* Maintain compatibility with multiple stdio monitors */ if (!strcmp(monitor_device,"stdio")) { for (i = 0; i < MAX_SERIAL_PORTS; i++) { -- 1.7.9.5