All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joelle van Dyne <j@getutm.app>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Joelle van Dyne <j@getutm.app>,
	"open list:Block layer core" <qemu-block@nongnu.org>,
	Max Reitz <mreitz@redhat.com>
Subject: [PATCH v2 2/4] block: check for sys/disk.h
Date: Mon,  8 Mar 2021 16:27:39 -0800	[thread overview]
Message-ID: <20210309002741.85057-3-j@getutm.app> (raw)
In-Reply-To: <20210309002741.85057-1-j@getutm.app>

Some BSD platforms do not have this header.

Signed-off-by: Joelle van Dyne <j@getutm.app>
---
 meson.build | 1 +
 block.c     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 0e53876f69..ba0db9fa1f 100644
--- a/meson.build
+++ b/meson.build
@@ -1153,6 +1153,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>'))
 
diff --git a/block.c b/block.c
index a1f3cecd75..b2705ad225 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
-- 
2.28.0



  parent reply	other threads:[~2021-03-09  0:31 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-09  0:27 [PATCH v2 0/4] Disable unsupported features on iOS hosts Joelle van Dyne
2021-03-09  0:27 ` [PATCH v2 1/4] block: feature detection for host block support Joelle van Dyne
2021-03-09  0:27 ` Joelle van Dyne [this message]
2021-03-09 11:25   ` [PATCH v2 2/4] block: check for sys/disk.h Peter Maydell
2021-03-09 12:09   ` Philippe Mathieu-Daudé
2021-03-09  0:27 ` [PATCH v2 3/4] block: detect DKIOCGETBLOCKCOUNT/SIZE before use Joelle van Dyne
2021-03-09 11:31   ` Peter Maydell
2021-03-09  0:27 ` [PATCH v2 4/4] slirp: feature detection for smbd Joelle van Dyne
2021-03-09 10:10   ` Peter Maydell
2021-03-09 12:12   ` Philippe Mathieu-Daudé
2021-03-09 14:09   ` Philippe Mathieu-Daudé
2021-03-09 18:11     ` Joelle van Dyne
2021-03-10  1:13       ` Samuel Thibault

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=20210309002741.85057-3-j@getutm.app \
    --to=j@getutm.app \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.