[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/25] osdep.h: Always include <sys/signal.h> if it exists
From: |
Peter Maydell |
Subject: |
[PULL 11/25] osdep.h: Always include <sys/signal.h> if it exists |
Date: |
Mon, 13 Jul 2020 15:10:50 +0100 |
From: David CARLIER <devnexen@gmail.com>
Regularize our handling of <sys/signal.h>: currently we include it in
osdep.h, but only for OpenBSD, and we include it without an ifdef
guard in a couple of C files. This causes problems for Haiku, which
doesn't have that header.
Instead, check in configure whether sys/signal.h exists, and if it
does then always include it from osdep.h.
Signed-off-by: David Carlier <devnexen@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20200703145614.16684-5-peter.maydell@linaro.org
[PMM: Expanded commit message; rename to HAVE_SYS_SIGNAL_H]
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
configure | 10 ++++++++++
include/qemu/osdep.h | 2 +-
hw/xen/xen-legacy-backend.c | 1 -
util/oslib-posix.c | 1 -
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 429c938708e..bc3b9ad9317 100755
--- a/configure
+++ b/configure
@@ -3244,6 +3244,13 @@ if check_include "libdrm/drm.h" ; then
have_drm_h=yes
fi
+#########################################
+# sys/signal.h check
+have_sys_signal_h=no
+if check_include "sys/signal.h" ; then
+ have_sys_signal_h=yes
+fi
+
##########################################
# VTE probe
@@ -7433,6 +7440,9 @@ fi
if test "$have_openpty" = "yes" ; then
echo "HAVE_OPENPTY=y" >> $config_host_mak
fi
+if test "$have_sys_signal_h" = "yes" ; then
+ echo "HAVE_SYS_SIGNAL_H=y" >> $config_host_mak
+fi
# Work around a system header bug with some kernel/XFS header
# versions where they both try to define 'struct fsxattr':
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 0fc206ae615..14059bce5a7 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -104,7 +104,7 @@ extern int daemon(int, int);
#include <setjmp.h>
#include <signal.h>
-#ifdef __OpenBSD__
+#ifdef HAVE_SYS_SIGNAL_H
#include <sys/signal.h>
#endif
diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
index 083d8dc1b28..b61a4855b7b 100644
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include <sys/signal.h>
#include "hw/sysbus.h"
#include "hw/boards.h"
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 39ddc77c85b..7ad9195c445 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -38,7 +38,6 @@
#include "qemu/sockets.h"
#include "qemu/thread.h"
#include <libgen.h>
-#include <sys/signal.h>
#include "qemu/cutils.h"
#ifdef CONFIG_LINUX
--
2.20.1
- [PULL 01/25] hw/arm/bcm2836: Remove unused 'cpu_type' field, (continued)
- [PULL 01/25] hw/arm/bcm2836: Remove unused 'cpu_type' field, Peter Maydell, 2020/07/13
- [PULL 02/25] target/arm: Fix mtedesc for do_mem_zpz, Peter Maydell, 2020/07/13
- [PULL 03/25] Add the ability to change the FEC PHY MDIO device number on i.MX25 processor, Peter Maydell, 2020/07/13
- [PULL 04/25] Add the ability to change the FEC PHY MDIO device number on i.MX6 processor, Peter Maydell, 2020/07/13
- [PULL 06/25] target/arm: Don't do raw writes for PMINTENCLR, Peter Maydell, 2020/07/13
- [PULL 05/25] Add the ability to change the FEC PHY MDIO devices numbers on i.MX7 processor, Peter Maydell, 2020/07/13
- [PULL 07/25] virtio-iommu: Fix coverity issue in virtio_iommu_handle_command(), Peter Maydell, 2020/07/13
- [PULL 08/25] build: Enable BSD symbols for Haiku, Peter Maydell, 2020/07/13
- [PULL 09/25] util/qemu-openpty.c: Don't assume pty.h is glibc-only, Peter Maydell, 2020/07/13
- [PULL 10/25] build: Check that mlockall() exists, Peter Maydell, 2020/07/13
- [PULL 11/25] osdep.h: Always include <sys/signal.h> if it exists,
Peter Maydell <=
- [PULL 12/25] osdep.h: For Haiku, define SIGIO as equivalent to SIGPOLL, Peter Maydell, 2020/07/13
- [PULL 14/25] util/compatfd.c: Only include <sys/syscall.h> if CONFIG_SIGNALFD, Peter Maydell, 2020/07/13
- [PULL 13/25] bswap.h: Include <endian.h> on Haiku for bswap operations, Peter Maydell, 2020/07/13
- [PULL 15/25] util/oslib-posix.c: Implement qemu_init_exec_dir() for Haiku, Peter Maydell, 2020/07/13
- [PULL 16/25] util/drm: make portable by avoiding struct dirent d_type, Peter Maydell, 2020/07/13
- [PULL 18/25] target/nios2: in line the semantics of DISAS_UPDATE with other targets, Peter Maydell, 2020/07/13
- [PULL 17/25] target/nios2: add DISAS_NORETURN case for nothing more to generate, Peter Maydell, 2020/07/13
- [PULL 22/25] hw/arm/tosa: Encapsulate misc GPIO handling in a device, Peter Maydell, 2020/07/13
- [PULL 21/25] hw/arm/tosa.c: Detabify, Peter Maydell, 2020/07/13
- [PULL 23/25] hw/arm/palm.c: Detabify, Peter Maydell, 2020/07/13