[Qemu-devel] [5055] Handle terminating signals (Gerd Hoffmann)

[Anthony Liguori <anthony@codemonkey.ws>]

Revision: 5055
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5055
Author:   aliguori
Date:     2008-08-21 20:08:03 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
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 <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/curses.c
    trunk/sdl.c
    trunk/vl.c

Modified: trunk/curses.c
===================================================================
--- trunk/curses.c	2008-08-21 19:33:09 UTC (rev 5054)
+++ trunk/curses.c	2008-08-21 20:08:03 UTC (rev 5055)
@@ -350,8 +350,6 @@
     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 */

Modified: trunk/sdl.c
===================================================================
--- trunk/sdl.c	2008-08-21 19:33:09 UTC (rev 5054)
+++ trunk/sdl.c	2008-08-21 20:08:03 UTC (rev 5055)
@@ -476,10 +476,8 @@
                 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 @@
         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;

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c	2008-08-21 19:33:09 UTC (rev 5054)
+++ trunk/vl.c	2008-08-21 20:08:03 UTC (rev 5055)
@@ -7621,6 +7621,8 @@
                 timeout = 0;
             }
         } else {
+            if (shutdown_requested)
+                break;
             timeout = 10;
         }
 #ifdef CONFIG_PROFILER
@@ -8185,6 +8187,26 @@
 
 #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 @@
 #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++) {