[Qemu-devel] [PATCH 05/17] Introduce os-posix.c and create os_setup_signal_handling()
From: Jes Sorensen Introcuce os-posix.c and move posix specific signal handling there. Signed-off-by: Jes Sorensen Acked-by: Juan Quintela Acked-by: Richard Henderson --- Makefile.objs |1 + os-posix.c | 41 + qemu-os-posix.h |2 ++ vl.c|8 +--- 4 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 os-posix.c diff --git a/Makefile.objs b/Makefile.objs index 58fdb03..2d94677 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -145,6 +145,7 @@ hw-obj-$(CONFIG_NAND) += nand.o hw-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o hw-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o hw-obj-$(CONFIG_WIN32) += os-win32.o +hw-obj-$(CONFIG_POSIX) += os-posix.o hw-obj-$(CONFIG_M48T59) += m48t59.o hw-obj-$(CONFIG_ESCC) += escc.o diff --git a/os-posix.c b/os-posix.c new file mode 100644 index 000..914a4d1 --- /dev/null +++ b/os-posix.c @@ -0,0 +1,41 @@ +/* + * os-posix.c + * + * Copyright (c) 2003-2008 Fabrice Bellard + * Copyright (c) 2010 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include +#include +#include + +/* Needed early for CONFIG_BSD etc. */ +#include "config-host.h" +#include "sysemu.h" + +void os_setup_signal_handling(void) +{ +struct sigaction act; +sigfillset(&act.sa_mask); +act.sa_flags = 0; +act.sa_handler = SIG_IGN; +sigaction(SIGPIPE, &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/vl.c b/vl.c index 4097762..29c9697 100644 --- a/vl.c +++ b/vl.c @@ -2460,13 +2460,7 @@ int main(int argc, char **argv, char **envp) QLIST_INIT (&vm_change_state_head); #ifndef _WIN32 -{ -struct sigaction act; -sigfillset(&act.sa_mask); -act.sa_flags = 0; -act.sa_handler = SIG_IGN; -sigaction(SIGPIPE, &act, NULL); -} +os_setup_signal_handling(); #else SetConsoleCtrlHandler(qemu_ctrl_handler, TRUE); /* Note: cpu_interrupt() is currently not SMP safe, so we force -- 1.6.5.2
[Qemu-devel] [PATCH 05/17] Introduce os-posix.c and create os_setup_signal_handling()
From: Jes Sorensen Introcuce os-posix.c and move posix specific signal handling there. Signed-off-by: Jes Sorensen --- Makefile.objs |1 + os-posix.c | 41 + qemu-os-posix.h |2 ++ vl.c|8 +--- 4 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 os-posix.c diff --git a/Makefile.objs b/Makefile.objs index 58fdb03..2d94677 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -145,6 +145,7 @@ hw-obj-$(CONFIG_NAND) += nand.o hw-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o hw-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o hw-obj-$(CONFIG_WIN32) += os-win32.o +hw-obj-$(CONFIG_POSIX) += os-posix.o hw-obj-$(CONFIG_M48T59) += m48t59.o hw-obj-$(CONFIG_ESCC) += escc.o diff --git a/os-posix.c b/os-posix.c new file mode 100644 index 000..914a4d1 --- /dev/null +++ b/os-posix.c @@ -0,0 +1,41 @@ +/* + * os-posix.c + * + * Copyright (c) 2003-2008 Fabrice Bellard + * Copyright (c) 2010 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include +#include +#include + +/* Needed early for CONFIG_BSD etc. */ +#include "config-host.h" +#include "sysemu.h" + +void os_setup_signal_handling(void) +{ +struct sigaction act; +sigfillset(&act.sa_mask); +act.sa_flags = 0; +act.sa_handler = SIG_IGN; +sigaction(SIGPIPE, &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/vl.c b/vl.c index c655582..7a46fee 100644 --- a/vl.c +++ b/vl.c @@ -2460,13 +2460,7 @@ int main(int argc, char **argv, char **envp) QLIST_INIT (&vm_change_state_head); #ifndef _WIN32 -{ -struct sigaction act; -sigfillset(&act.sa_mask); -act.sa_flags = 0; -act.sa_handler = SIG_IGN; -sigaction(SIGPIPE, &act, NULL); -} +os_setup_signal_handling(); #else SetConsoleCtrlHandler(qemu_ctrl_handler, TRUE); /* Note: cpu_interrupt() is currently not SMP safe, so we force -- 1.6.5.2
[Qemu-devel] [PATCH 05/17] Introduce os-posix.c and create os_setup_signal_handling()
From: Jes Sorensen Introcuce os-posix.c and move posix specific signal handling there. Add dummy stub for win32. Signed-off-by: Jes Sorensen --- Makefile.objs |1 + os-posix.c | 41 + qemu-os-posix.h |2 ++ qemu-os-win32.h |1 + vl.c|8 +--- 5 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 os-posix.c diff --git a/Makefile.objs b/Makefile.objs index 58fdb03..2d94677 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -145,6 +145,7 @@ hw-obj-$(CONFIG_NAND) += nand.o hw-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o hw-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o hw-obj-$(CONFIG_WIN32) += os-win32.o +hw-obj-$(CONFIG_POSIX) += os-posix.o hw-obj-$(CONFIG_M48T59) += m48t59.o hw-obj-$(CONFIG_ESCC) += escc.o diff --git a/os-posix.c b/os-posix.c new file mode 100644 index 000..914a4d1 --- /dev/null +++ b/os-posix.c @@ -0,0 +1,41 @@ +/* + * os-posix.c + * + * Copyright (c) 2003-2008 Fabrice Bellard + * Copyright (c) 2010 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include +#include +#include + +/* Needed early for CONFIG_BSD etc. */ +#include "config-host.h" +#include "sysemu.h" + +void os_setup_signal_handling(void) +{ +struct sigaction act; +sigfillset(&act.sa_mask); +act.sa_flags = 0; +act.sa_handler = SIG_IGN; +sigaction(SIGPIPE, &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..74c7b4d 100644 --- a/qemu-os-win32.h +++ b/qemu-os-win32.h @@ -40,5 +40,6 @@ typedef void WaitObjectFunc(void *opaque); int qemu_add_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque); void qemu_del_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque); +static inline void os_setup_signal_handling(void) {} void os_host_main_loop_wait(int *timeout); #endif diff --git a/vl.c b/vl.c index c655582..7a46fee 100644 --- a/vl.c +++ b/vl.c @@ -2460,13 +2460,7 @@ int main(int argc, char **argv, char **envp) QLIST_INIT (&vm_change_state_head); #ifndef _WIN32 -{ -struct sigaction act; -sigfillset(&act.sa_mask); -act.sa_flags = 0; -act.sa_handler = SIG_IGN; -sigaction(SIGPIPE, &act, NULL); -} +os_setup_signal_handling(); #else SetConsoleCtrlHandler(qemu_ctrl_handler, TRUE); /* Note: cpu_interrupt() is currently not SMP safe, so we force -- 1.6.5.2