[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/17] Move main signal handler setup to os specific
From: |
Jes . Sorensen |
Subject: |
[Qemu-devel] [PATCH 08/17] Move main signal handler setup to os specificfiles. |
Date: |
Thu, 10 Jun 2010 11:42:22 +0200 |
From: Jes Sorensen <address@hidden>
Move main signal handler setup to os specific files.
Signed-off-by: Jes Sorensen <address@hidden>
Acked-by: Juan Quintela <address@hidden>
Acked-by: Richard Henderson <address@hidden>
---
os-posix.c | 27 +++++++++++++++++++++++++++
qemu-os-posix.h | 2 ++
qemu-os-win32.h | 3 +++
vl.c | 33 +--------------------------------
4 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/os-posix.c b/os-posix.c
index 948f662..01dbec2 100644
--- a/os-posix.c
+++ b/os-posix.c
@@ -26,6 +26,8 @@
#include <unistd.h>
#include <fcntl.h>
#include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
/* Needed early for CONFIG_BSD etc. */
#include "config-host.h"
@@ -39,3 +41,28 @@ void os_setup_early_signal_handling(void)
act.sa_handler = SIG_IGN;
sigaction(SIGPIPE, &act, NULL);
}
+
+static void termsig_handler(int signal)
+{
+ qemu_system_shutdown_request();
+}
+
+static void sigchld_handler(int signal)
+{
+ waitpid(-1, NULL, WNOHANG);
+}
+
+void os_setup_signal_handling(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);
+
+ act.sa_handler = sigchld_handler;
+ act.sa_flags = SA_NOCLDSTOP;
+ sigaction(SIGCHLD, &act, NULL);
+}
diff --git a/qemu-os-posix.h b/qemu-os-posix.h
index 96d1036..ff5adb1 100644
--- a/qemu-os-posix.h
+++ b/qemu-os-posix.h
@@ -30,4 +30,6 @@ static inline void os_host_main_loop_wait(int *timeout)
{
}
+void os_setup_signal_handling(void);
+
#endif
diff --git a/qemu-os-win32.h b/qemu-os-win32.h
index 4d1cac8..e7e2ee3 100644
--- a/qemu-os-win32.h
+++ b/qemu-os-win32.h
@@ -41,4 +41,7 @@ int qemu_add_wait_object(HANDLE handle, WaitObjectFunc *func,
void *opaque);
void qemu_del_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque);
void os_host_main_loop_wait(int *timeout);
+
+static inline void os_setup_signal_handling(void) {}
+
#endif
diff --git a/vl.c b/vl.c
index a8fcb65..1fd839d 100644
--- a/vl.c
+++ b/vl.c
@@ -1986,35 +1986,6 @@ static int balloon_parse(const char *arg)
return -1;
}
-#ifndef _WIN32
-
-static void termsig_handler(int signal)
-{
- qemu_system_shutdown_request();
-}
-
-static void sigchld_handler(int signal)
-{
- waitpid(-1, NULL, WNOHANG);
-}
-
-static void sighandler_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);
-
- act.sa_handler = sigchld_handler;
- act.sa_flags = SA_NOCLDSTOP;
- sigaction(SIGCHLD, &act, NULL);
-}
-
-#endif
-
#ifdef _WIN32
/* Look for support files in the same directory as the executable. */
static char *find_datadir(const char *argv0)
@@ -3556,10 +3527,8 @@ int main(int argc, char **argv, char **envp)
cpu_synchronize_all_post_init();
-#ifndef _WIN32
/* must be after terminal init, SDL library changes signal handlers */
- sighandler_setup();
-#endif
+ os_setup_signal_handling();
set_numa_modes();
--
1.6.5.2
- [Qemu-devel] [PATCH v4 00/17] clean up vl.c code, Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 01/17] vl.c: Remove double include of netinet/in.h for Solaris, Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 03/17] Introduce os-win32.c and move polling functions from vl.c, Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 04/17] vl.c: Move host_main_loop_wait() to OS specific files., Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 05/17] Introduce os-posix.c and create os_setup_signal_handling(), Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 06/17] Move win32 early signal handling setup to os_setup_signal_handling(), Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 07/17] Rename os_setup_signal_handling() to os_setup_early_signal_handling(), Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 02/17] Create qemu-os-win32.h and move WIN32 specific declarations there, Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 08/17] Move main signal handler setup to os specificfiles.,
Jes . Sorensen <=
- [Qemu-devel] [PATCH 10/17] Rename qemu-options.h to qemu-options.def, Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 12/17] Move runas handling from vl.c to OS specific files., Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 13/17] Move chroot handling to OS specific files., Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 09/17] Move find_datadir to OS specific files., Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 11/17] Introduce OS specific cmdline argument handling and move SMB arg to os-posix.c, Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 15/17] Make os_change_process_uid and os_change_root os-posix.c local, Jes . Sorensen, 2010/06/10
- [Qemu-devel] [PATCH 14/17] Move daemonize handling to OS specific files, Jes . Sorensen, 2010/06/10