OSDN Git Service

register signal handler after initializing SDL.
authorGleb Natapov <gleb@redhat.com>
Thu, 31 Mar 2011 09:27:23 +0000 (11:27 +0200)
committerAurelien Jarno <aurelien@aurel32.net>
Sun, 3 Apr 2011 22:26:07 +0000 (00:26 +0200)
SDL library initialization mangles signal handlers, so QEMU should
register them after initializing SDL. This was the case before and code
even have a comment about that. Fix it to be so again.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
vl.c

diff --git a/vl.c b/vl.c
index 5c80600..4d9e503 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -3059,9 +3059,6 @@ int main(int argc, char **argv, char **envp)
 
     cpu_synchronize_all_post_init();
 
-    /* must be after terminal init, SDL library changes signal handlers */
-    os_setup_signal_handling();
-
     set_numa_modes();
 
     current_machine = machine;
@@ -3117,6 +3114,9 @@ int main(int argc, char **argv, char **envp)
         break;
     }
 
+    /* must be after terminal init, SDL library changes signal handlers */
+    os_setup_signal_handling();
+
 #ifdef CONFIG_VNC
     /* init remote displays */
     if (vnc_display) {