summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-08-03 22:09:30 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-08-03 22:09:30 +0000
commitd2bfb39ad220a6431e366bdff72353b09f60e3db (patch)
tree78170ba5183c4745aa9f37331c22f6f41e5f5dee
parent-fno-gcse option for opcodes to use asm macros with gcc >= 3.3 on i386 (Piotr... (diff)
downloadqemu-kvm-d2bfb39ad220a6431e366bdff72353b09f60e3db.tar.gz
qemu-kvm-d2bfb39ad220a6431e366bdff72353b09f60e3db.tar.bz2
qemu-kvm-d2bfb39ad220a6431e366bdff72353b09f60e3db.zip
use the kernel sigaction syscall to avoid relying on glibc one
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1044 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--osdep.c16
-rw-r--r--osdep.h23
-rw-r--r--vl.c11
3 files changed, 39 insertions, 11 deletions
diff --git a/osdep.c b/osdep.c
index 76bfa2663..087a5c218 100644
--- a/osdep.c
+++ b/osdep.c
@@ -144,6 +144,22 @@ void *shmat(int shmid, const void *shmaddr, int shmflg)
}
/****************************************************************/
+/* sigaction bypassing the threads */
+
+static int kernel_sigaction(int signum, const struct qemu_sigaction *act,
+ struct qemu_sigaction *oldact,
+ int sigsetsize)
+{
+ QEMU_SYSCALL4(rt_sigaction, signum, act, oldact, sigsetsize);
+}
+
+int qemu_sigaction(int signum, const struct qemu_sigaction *act,
+ struct qemu_sigaction *oldact)
+{
+ return kernel_sigaction(signum, act, oldact, 8);
+}
+
+/****************************************************************/
/* memory allocation */
//#define DEBUG_MALLOC
diff --git a/osdep.h b/osdep.h
index dfe80bcf9..f1d18202b 100644
--- a/osdep.h
+++ b/osdep.h
@@ -22,6 +22,29 @@ void *get_mmap_addr(unsigned long size);
extern void __longjmp(jmp_buf env, int val);
#define longjmp __longjmp
+#include <signal.h>
+
+/* NOTE: it works only because the glibc sigset_t is >= kernel sigset_t */
+struct qemu_sigaction {
+ union {
+ void (*_sa_handler)(int);
+ void (*_sa_sigaction)(int, struct siginfo *, void *);
+ } _u;
+ unsigned long sa_flags;
+ void (*sa_restorer)(void);
+ sigset_t sa_mask; /* mask last for extensibility */
+};
+
+int qemu_sigaction(int signum, const struct qemu_sigaction *act,
+ struct qemu_sigaction *oldact);
+
+#undef sigaction
+#undef sa_handler
+#undef sa_sigaction
+#define sigaction qemu_sigaction
+#define sa_handler _u._sa_handler
+#define sa_sigaction _u._sa_sigaction
+
#endif
#endif
diff --git a/vl.c b/vl.c
index 484d4becc..646d1ff94 100644
--- a/vl.c
+++ b/vl.c
@@ -68,17 +68,6 @@
#ifdef __APPLE__
#include <SDL/SDL.h>
#endif
-#if defined(__linux__)
-/* SDL use the pthreads and they modify sigaction. We don't
- want that. */
-#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
-extern void __libc_sigaction();
-#define sigaction(sig, act, oact) __libc_sigaction(sig, act, oact)
-#else
-extern void __sigaction();
-#define sigaction(sig, act, oact) __sigaction(sig, act, oact)
-#endif
-#endif /* __linux__ */
#endif /* CONFIG_SDL */
#include "disas.h"