From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, "Peter Maydell" <peter.maydell@linaro.org>,
vsementsov@virtuozzo.com, qemu-block@nongnu.org,
"Joelle van Dyne" <j@getutm.app>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v4 6/7] block: check for sys/disk.h
Date: Tue, 8 Jun 2021 15:16:33 +0200 [thread overview]
Message-ID: <20210608131634.423904-7-pbonzini@redhat.com> (raw)
In-Reply-To: <20210608131634.423904-1-pbonzini@redhat.com>
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 3f456892d0..1d37f133a8 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 53150866ac..7e3902b5c8 100644
--- a/meson.build
+++ b/meson.build
@@ -1187,6 +1187,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
next prev parent reply other threads:[~2021-06-08 13:20 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-08 13:16 [PATCH v4 0/7] block: file-posix queue Paolo Bonzini
2021-06-08 13:16 ` [PATCH v4 1/7] file-posix: fix max_iov for /dev/sg devices Paolo Bonzini
2021-06-08 17:34 ` Eric Blake
2021-06-08 19:14 ` Vladimir Sementsov-Ogievskiy
2021-06-09 16:08 ` Maxim Levitsky
2021-06-23 15:42 ` Max Reitz
2021-06-24 7:33 ` Vladimir Sementsov-Ogievskiy
2021-06-08 13:16 ` [PATCH v4 2/7] scsi-generic: pass max_segments via max_iov field in BlockLimits Paolo Bonzini
2021-06-08 17:42 ` Eric Blake
2021-06-09 16:10 ` Maxim Levitsky
2021-06-08 13:16 ` [PATCH v4 3/7] block: add max_hw_transfer to BlockLimits Paolo Bonzini
2021-06-08 17:48 ` Eric Blake
2021-06-09 16:12 ` Maxim Levitsky
2021-06-08 13:16 ` [PATCH v4 4/7] file-posix: try BLKSECTGET on block devices too, do not round to power of 2 Paolo Bonzini
2021-06-08 17:53 ` Eric Blake
2021-06-09 16:15 ` Maxim Levitsky
2021-06-08 13:16 ` [PATCH v4 5/7] block: feature detection for host block support Paolo Bonzini
2021-06-23 15:44 ` Max Reitz
2021-06-08 13:16 ` Paolo Bonzini [this message]
2021-06-08 13:16 ` [PATCH v4 7/7] block: detect DKIOCGETBLOCKCOUNT/SIZE before use Paolo Bonzini
2021-06-23 15:47 ` Max Reitz
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=20210608131634.423904-7-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=j@getutm.app \
--cc=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/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).