[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/6] block: check for sys/disk.h
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 5/6] block: check for sys/disk.h |
Date: |
Mon, 24 May 2021 18:36:44 +0200 |
From: Joelle van Dyne <j@getutm.app>
Some BSD platforms do not have this header.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Joelle van Dyne <j@getutm.app>
Message-Id: <20210315180341.31638-3-j@getutm.app>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
block.c | 2 +-
meson.build | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index 0dc97281dc..a16a2840d3 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/meson.build b/meson.build
index 338ea279ee..82d0e6a224 100644
--- a/meson.build
+++ b/meson.build
@@ -1168,6 +1168,7 @@ 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_SYSTEM_FUNCTION', cc.has_function('system', prefix:
'#include <stdlib.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'))
config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix:
'#include <sys/uio.h>'))
--
2.31.1
- [PATCH v2 0/6] block: file-posix queue, Paolo Bonzini, 2021/05/24
- [PATCH v2 1/6] scsi-generic: pass max_segments via max_iov field in BlockLimits, Paolo Bonzini, 2021/05/24
- [PATCH v2 2/6] file-posix: try BLKSECTGET on block devices too, do not round to power of 2, Paolo Bonzini, 2021/05/24
- [PATCH v2 3/6] file-posix: fix max_iov for /dev/sg devices, Paolo Bonzini, 2021/05/24
- [PATCH v2 4/6] block: feature detection for host block support, Paolo Bonzini, 2021/05/24
- [PATCH v2 5/6] block: check for sys/disk.h,
Paolo Bonzini <=
- [PATCH v2 6/6] block: detect DKIOCGETBLOCKCOUNT/SIZE before use, Paolo Bonzini, 2021/05/24