diff options
| author | Peter Maydell | 2021-01-20 18:44:31 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-01-20 18:44:31 +0100 |
| commit | 954b83f13236d21b4116b93a726ea36b5dc2d303 (patch) | |
| tree | 64dbca7f47cdd1c2d1ca1940b0f5307d8ca4d412 /include/qemu/osdep.h | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210119-... (diff) | |
| parent | MAINTAINERS: Make status spellings consistent (diff) | |
| download | qemu-954b83f13236d21b4116b93a726ea36b5dc2d303.tar.gz qemu-954b83f13236d21b4116b93a726ea36b5dc2d303.tar.xz qemu-954b83f13236d21b4116b93a726ea36b5dc2d303.zip | |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2021-01-20' into staging
* Fixes for compiling QEMU on Alpine Linux
* Add Alpine Linux to the gitlab-CI
* Some small fixes for qtests
* Updates to the MAINTAINERS file
# gpg: Signature made Wed 20 Jan 2021 12:56:14 GMT
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth-gitlab/tags/pull-request-2021-01-20:
MAINTAINERS: Make status spellings consistent
MAINTAINERS: Remove Ben Warren
tests: Fix memory leak in tpm-util.c
qtest/npcm7xx_pwm-test: Fix memleak in pwm_qom_get
gitlab-ci: Add alpine to pipeline
tests/check-block.sh: Refuse to run the iotests with BusyBox' sed
tests/docker: Add dockerfile for Alpine Linux
accel/kvm: avoid using predefined PAGE_SIZE
tests: Rename PAGE_SIZE definitions
elf2dmp: Rename PAGE_SIZE to ELF2DMP_PAGE_SIZE
hw/block/nand: Rename PAGE_SIZE to NAND_PAGE_SIZE
libvhost-user: Include poll.h instead of sys/poll.h
configure: Add sys/timex.h to probe clock_adjtime
osdep.h: Remove <sys/signal.h> include
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/osdep.h')
| -rw-r--r-- | include/qemu/osdep.h | 4 |
1 files changed, 0 insertions, 4 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 |