qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jes.Sorensen@redhat.com
To: anthony@codemonkey.ws
Cc: Jes Sorensen <Jes.Sorensen@redhat.com>, qemu-devel@nongnu.org
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	[thread overview]
Message-ID: <1275667755-4821-6-git-send-email-Jes.Sorensen@redhat.com> (raw)
In-Reply-To: <1275667755-4821-1-git-send-email-Jes.Sorensen@redhat.com>

From: Jes Sorensen <Jes.Sorensen@redhat.com>

Introcuce os-posix.c and move posix specific signal handling
there.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 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

  parent reply	other threads:[~2010-06-04 16:31 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-04 16:08 [Qemu-devel] [PATCH v3 00/17] clean up vl.c code Jes.Sorensen
2010-06-04 16:08 ` [Qemu-devel] [PATCH 01/17] vl.c: Remove double include of netinet/in.h for Solaris Jes.Sorensen
2010-06-06 11:13   ` Andreas Färber
2010-06-04 16:09 ` [Qemu-devel] [PATCH 02/17] Create qemu-os-win32.h and move WIN32 specific declarations there Jes.Sorensen
2010-06-04 16:09 ` [Qemu-devel] [PATCH 03/17] Introduce os-win32.c and move polling functions from vl.c Jes.Sorensen
2010-06-04 16:09 ` [Qemu-devel] [PATCH 04/17] vl.c: Move host_main_loop_wait() to OS specific files Jes.Sorensen
2010-06-04 16:09 ` Jes.Sorensen [this message]
2010-06-04 16:09 ` [Qemu-devel] [PATCH 06/17] Move win32 early signal handling setup to os_setup_signal_handling() Jes.Sorensen
2010-06-04 16:09 ` [Qemu-devel] [PATCH 07/17] Rename os_setup_signal_handling() to os_setup_early_signal_handling() Jes.Sorensen
2010-06-04 16:09 ` [Qemu-devel] [PATCH 08/17] Move main signal handler setup to os specificfiles Jes.Sorensen
2010-06-04 16:09 ` [Qemu-devel] [PATCH 09/17] Move find_datadir to OS specific files Jes.Sorensen
2010-06-04 16:09 ` [Qemu-devel] [PATCH 10/17] Rename qemu-options.h to qemu-options.def Jes.Sorensen
2010-06-04 16:09 ` [Qemu-devel] [PATCH 11/17] Introduce OS specific cmdline argument handling and move SMB arg to os-posix.c Jes.Sorensen
2010-06-04 16:09 ` [Qemu-devel] [PATCH 12/17] Move runas handling from vl.c to OS specific files Jes.Sorensen
2010-06-04 16:09 ` [Qemu-devel] [PATCH 13/17] Move chroot handling " Jes.Sorensen
2010-06-04 16:09 ` [Qemu-devel] [PATCH 14/17] Move daemonize " Jes.Sorensen
2010-06-04 16:09 ` [Qemu-devel] [PATCH 15/17] Make os_change_process_uid and os_change_root os-posix.c local Jes.Sorensen
2010-06-04 16:09 ` [Qemu-devel] [PATCH 16/17] Move line-buffering setup to OS specific files Jes.Sorensen
2010-06-04 16:09 ` [Qemu-devel] [PATCH 17/17] Move set_proc_name() " Jes.Sorensen
2010-06-04 17:27 ` [Qemu-devel] [PATCH v3 00/17] clean up vl.c code Richard Henderson
2010-06-07 21:41 ` [Qemu-devel] " Juan Quintela
2010-06-08  5:49   ` Jes Sorensen
  -- strict thread matches above, loose matches on Subject: below --
2010-06-10  9:42 [Qemu-devel] [PATCH v4 " Jes.Sorensen
2010-06-10  9:42 ` [Qemu-devel] [PATCH 05/17] Introduce os-posix.c and create os_setup_signal_handling() Jes.Sorensen
2010-06-04 13:24 [Qemu-devel] [PATCH v2 00/17] clean up vl.c code Jes.Sorensen
2010-06-04 13:24 ` [Qemu-devel] [PATCH 05/17] Introduce os-posix.c and create os_setup_signal_handling() Jes.Sorensen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1275667755-4821-6-git-send-email-Jes.Sorensen@redhat.com \
    --to=jes.sorensen@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).