From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: John Snow <jsnow@redhat.com>, Michael Forney <mforney@mforney.org>
Subject: [PULL 01/14] osdep.h: Remove <sys/signal.h> include
Date: Wed, 20 Jan 2021 16:17:38 +0100 [thread overview]
Message-ID: <20210120151751.520597-2-thuth@redhat.com> (raw)
In-Reply-To: <20210120151751.520597-1-thuth@redhat.com>
From: Michael Forney <mforney@mforney.org>
Prior to 2a4b472c3c, sys/signal.h was only included on OpenBSD
(apart from two .c files). The POSIX standard location for this
header is just <signal.h> and in fact, OpenBSD's signal.h includes
sys/signal.h itself.
Unconditionally including <sys/signal.h> on musl causes warnings
for just about every source file:
/usr/include/sys/signal.h:1:2: warning: #warning redirecting incorrect #include <sys/signal.h> to <signal.h> [-Wcpp]
1 | #warning redirecting incorrect #include <sys/signal.h> to <signal.h>
| ^~~~~~~
Since there don't seem to be any platforms which require including
<sys/signal.h> in addition to <signal.h>, and some platforms like
Haiku lack it completely, just remove it.
Tested building on OpenBSD after removing this include.
Signed-off-by: Michael Forney <mforney@mforney.org>
Tested-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210113215600.16100-1-mforney@mforney.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
include/qemu/osdep.h | 4 ----
meson.build | 1 -
2 files changed, 5 deletions(-)
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index f9ec8c84e9..a434382c58 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -104,10 +104,6 @@ extern int daemon(int, int);
#include <setjmp.h>
#include <signal.h>
-#ifdef HAVE_SYS_SIGNAL_H
-#include <sys/signal.h>
-#endif
-
#ifndef _WIN32
#include <sys/wait.h>
#else
diff --git a/meson.build b/meson.build
index 3d889857a0..af2bc89741 100644
--- a/meson.build
+++ b/meson.build
@@ -1113,7 +1113,6 @@ config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h'))
config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h'))
config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h'))
config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h'))
-config_host_data.set('HAVE_SYS_SIGNAL_H', cc.has_header('sys/signal.h'))
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
arrays = ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
--
2.27.0
next prev parent reply other threads:[~2021-01-20 15:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 15:17 [PULL 00/14] gitlab-CI, qtests and misc patches Thomas Huth
2021-01-20 15:17 ` Thomas Huth [this message]
2021-01-20 15:17 ` [PULL 02/14] configure: Add sys/timex.h to probe clock_adjtime Thomas Huth
2021-01-20 15:17 ` [PULL 03/14] libvhost-user: Include poll.h instead of sys/poll.h Thomas Huth
2021-01-20 15:17 ` [PULL 04/14] hw/block/nand: Rename PAGE_SIZE to NAND_PAGE_SIZE Thomas Huth
2021-01-20 15:17 ` [PULL 05/14] elf2dmp: Rename PAGE_SIZE to ELF2DMP_PAGE_SIZE Thomas Huth
2021-01-20 15:17 ` [PULL 06/14] tests: Rename PAGE_SIZE definitions Thomas Huth
2021-01-20 15:17 ` [PULL 07/14] accel/kvm: avoid using predefined PAGE_SIZE Thomas Huth
2021-01-20 15:17 ` [PULL 08/14] tests/docker: Add dockerfile for Alpine Linux Thomas Huth
2021-01-20 15:17 ` [PULL 09/14] tests/check-block.sh: Refuse to run the iotests with BusyBox' sed Thomas Huth
2021-01-20 15:17 ` [PULL 10/14] gitlab-ci: Add alpine to pipeline Thomas Huth
2021-01-20 15:17 ` [PULL 11/14] qtest/npcm7xx_pwm-test: Fix memleak in pwm_qom_get Thomas Huth
2021-01-20 15:17 ` [PULL 12/14] tests: Fix memory leak in tpm-util.c Thomas Huth
2021-01-20 15:17 ` [PULL 13/14] MAINTAINERS: Remove Ben Warren Thomas Huth
2021-01-20 15:17 ` [PULL 14/14] MAINTAINERS: Make status spellings consistent Thomas Huth
2021-01-21 9:40 ` [PULL 00/14] gitlab-CI, qtests and misc patches Peter Maydell
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=20210120151751.520597-2-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=jsnow@redhat.com \
--cc=mforney@mforney.org \
--cc=peter.maydell@linaro.org \
--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).