[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 03/11] configure: check for sys/disk.h
From: |
Joelle van Dyne |
Subject: |
[PATCH v8 03/11] configure: check for sys/disk.h |
Date: |
Fri, 22 Jan 2021 20:56:24 -0800 |
Some BSD platforms do not have this header.
Signed-off-by: Joelle van Dyne <j@getutm.app>
---
meson.build | 1 +
block.c | 2 +-
block/file-posix.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 27110075df..6818d97df5 100644
--- a/meson.build
+++ b/meson.build
@@ -1117,6 +1117,7 @@ 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_HOST_BLOCK_DEVICE', have_host_block_device)
+config_host_data.set('HAVE_SYS_DISK_H', cc.has_header('sys/disk.h'))
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
arrays = ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST',
'CONFIG_BDRV_RO_WHITELIST']
diff --git a/block.c b/block.c
index 8b9d457546..c4cf391dea 100644
--- a/block.c
+++ b/block.c
@@ -54,7 +54,7 @@
#ifdef CONFIG_BSD
#include <sys/ioctl.h>
#include <sys/queue.h>
-#ifndef __DragonFly__
+#if defined(HAVE_SYS_DISK_H)
#include <sys/disk.h>
#endif
#endif
diff --git a/block/file-posix.c b/block/file-posix.c
index 11d2021346..666d3e7504 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -2320,7 +2320,7 @@ again:
}
if (size == 0)
#endif
-#if defined(__APPLE__) && defined(__MACH__)
+#if defined(HAVE_SYS_DISK_H) && defined(__APPLE__) && defined(__MACH__)
{
uint64_t sectors = 0;
uint32_t sector_size = 0;
--
2.28.0
- [PATCH v8 00/11] iOS and Apple Silicon host support, Joelle van Dyne, 2021/01/22
- [PATCH v8 02/11] configure: cross-compiling with empty cross_prefix, Joelle van Dyne, 2021/01/22
- [PATCH v8 01/11] block: feature detection for host block support, Joelle van Dyne, 2021/01/22
- [PATCH v8 04/11] slirp: feature detection for smbd, Joelle van Dyne, 2021/01/22
- [PATCH v8 05/11] osdep: build with non-working system() function, Joelle van Dyne, 2021/01/22
- [PATCH v8 06/11] darwin: remove redundant dependency declaration, Joelle van Dyne, 2021/01/22
- [PATCH v8 03/11] configure: check for sys/disk.h,
Joelle van Dyne <=
- [PATCH v8 07/11] darwin: fix cross-compiling for Darwin, Joelle van Dyne, 2021/01/22
- [PATCH v8 09/11] block: check availablity for preadv/pwritev on mac, Joelle van Dyne, 2021/01/22
- [PATCH v8 10/11] darwin: detect CoreAudio for build, Joelle van Dyne, 2021/01/22
- [PATCH v8 11/11] darwin: remove 64-bit build detection on 32-bit OS, Joelle van Dyne, 2021/01/22
- [PATCH v8 08/11] configure: cross compile should use x86_64 cpu_family, Joelle van Dyne, 2021/01/22