[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/17] Introduce os-posix.c and create os_setup_sign
From: |
Jes . Sorensen |
Subject: |
[Qemu-devel] [PATCH 05/17] Introduce os-posix.c and create os_setup_signal_handling() |
Date: |
Fri, 4 Jun 2010 18:09:03 +0200 |
From: Jes Sorensen <address@hidden>
Introcuce os-posix.c and move posix specific signal handling
there.
Signed-off-by: Jes Sorensen <address@hidden>
---
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 0000000..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 <unistd.h>
+#include <fcntl.h>
+#include <signal.h>
+
+/* 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
- Re: [Qemu-devel] [PATCH 01/17] vl.c: Remove double include of netinet/in.h for Solaris, (continued)
- [Qemu-devel] [PATCH 07/17] Rename os_setup_signal_handling() to os_setup_early_signal_handling(), Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 12/17] Move runas handling from vl.c to OS specific files., Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 17/17] Move set_proc_name() to OS specific files., Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 14/17] Move daemonize handling to OS specific files, Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 09/17] Move find_datadir to OS specific files., Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 06/17] Move win32 early signal handling setup to os_setup_signal_handling(), Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 15/17] Make os_change_process_uid and os_change_root os-posix.c local, Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 03/17] Introduce os-win32.c and move polling functions from vl.c, Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 04/17] vl.c: Move host_main_loop_wait() to OS specific files., Jes . Sorensen, 2010/06/04
- [Qemu-devel] [PATCH 05/17] Introduce os-posix.c and create os_setup_signal_handling(),
Jes . Sorensen <=
- [Qemu-devel] [PATCH 11/17] Introduce OS specific cmdline argument handling and move SMB arg to os-posix.c, Jes . Sorensen, 2010/06/04
- Re: [Qemu-devel] [PATCH v3 00/17] clean up vl.c code, Richard Henderson, 2010/06/04
- [Qemu-devel] Re: [PATCH v3 00/17] clean up vl.c code, Juan Quintela, 2010/06/07