[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/12] configure: Add a proper check for sys/ioccom.h and use it i
From: |
Thomas Huth |
Subject: |
[PULL 04/12] configure: Add a proper check for sys/ioccom.h and use it in tpm_ioctl.h |
Date: |
Tue, 17 Nov 2020 10:57:40 +0100 |
On Solaris and Haiku, the _IO() macros are defined in <sys/ioccom.h>.
Add a proper check for this header to our build system, and make sure
to include the header in tpm_ioctl.h to fix a build failure on Solaris
and Haiku.
Message-Id: <20201115152317.42752-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
backends/tpm/tpm_ioctl.h | 4 ++++
meson.build | 2 ++
nbd/nbd-internal.h | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/backends/tpm/tpm_ioctl.h b/backends/tpm/tpm_ioctl.h
index f5f5c553a9..bd6c12cb86 100644
--- a/backends/tpm/tpm_ioctl.h
+++ b/backends/tpm/tpm_ioctl.h
@@ -12,6 +12,10 @@
#include <sys/uio.h>
#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCCOM_H
+#include <sys/ioccom.h>
+#endif
+
/*
* Every response from a command involving a TPM command execution must hold
* the ptm_res as the first element.
diff --git a/meson.build b/meson.build
index 132bc49782..30f86ddafb 100644
--- a/meson.build
+++ b/meson.build
@@ -794,6 +794,8 @@ config_host_data.set('QEMU_VERSION_MAJOR',
meson.project_version().split('.')[0]
config_host_data.set('QEMU_VERSION_MINOR',
meson.project_version().split('.')[1])
config_host_data.set('QEMU_VERSION_MICRO',
meson.project_version().split('.')[2])
+config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h'))
+
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
arrays = ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST',
'CONFIG_BDRV_RO_WHITELIST']
strings = ['HOST_DSOSUF', 'CONFIG_IASL']
diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h
index 60629ef160..1b2141ab4b 100644
--- a/nbd/nbd-internal.h
+++ b/nbd/nbd-internal.h
@@ -19,7 +19,7 @@
#ifndef _WIN32
#include <sys/ioctl.h>
#endif
-#if defined(__sun__) || defined(__HAIKU__)
+#ifdef HAVE_SYS_IOCCOM_H
#include <sys/ioccom.h>
#endif
--
2.18.4
- [PULL 00/12] Misc fixes for 5.2, Thomas Huth, 2020/11/17
- [PULL 01/12] qemu/bswap: Remove unused qemu_bswap_len(), Thomas Huth, 2020/11/17
- [PULL 02/12] configure: Fix the _BSD_SOURCE define for the Haiku build, Thomas Huth, 2020/11/17
- [PULL 07/12] target/microblaze: Fix possible array out of bounds in mmu_write(), Thomas Huth, 2020/11/17
- [PULL 08/12] gitlab-ci: Use $CI_REGISTRY instead of hard-coding registry.gitlab.com, Thomas Huth, 2020/11/17
- [PULL 03/12] configure: Do not build pc-bios/optionrom on Haiku, Thomas Huth, 2020/11/17
- [PULL 09/12] ssd0323: put it into the 'display' category, Thomas Huth, 2020/11/17
- [PULL 04/12] configure: Add a proper check for sys/ioccom.h and use it in tpm_ioctl.h,
Thomas Huth <=
- [PULL 05/12] tests/vm: Add Haiku test based on their vagrant images, Thomas Huth, 2020/11/17
- [PULL 06/12] tests/vm: update NetBSD to 9.1, Thomas Huth, 2020/11/17
- [PULL 10/12] ads7846: put it into the 'input' category, Thomas Huth, 2020/11/17
- [PULL 11/12] nand: put it into the 'storage' category, Thomas Huth, 2020/11/17
- [PULL 12/12] max111x: put it into the 'misc' category, Thomas Huth, 2020/11/17
- Re: [PULL 00/12] Misc fixes for 5.2, Peter Maydell, 2020/11/17