qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Joelle van Dyne" <j@getutm.app>,
	qemu-block@nongnu.org
Subject: [PATCH 4/5] block: check for sys/disk.h
Date: Tue, 18 May 2021 10:39:00 +0200	[thread overview]
Message-ID: <20210518083901.97369-5-pbonzini@redhat.com> (raw)
In-Reply-To: <20210518083901.97369-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 9ad725d205..86a8c638c6 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 b3cc45c41d..5f0d4a1bc3 100644
--- a/meson.build
+++ b/meson.build
@@ -1164,6 +1164,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




  parent reply	other threads:[~2021-05-18  8:45 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-18  8:38 [PATCH 0/5] block: file-posix queue Paolo Bonzini
2021-05-18  8:38 ` [PATCH 1/5] file-posix: try BLKSECTGET on block devices too, do not round to power of 2 Paolo Bonzini
2021-05-18  8:38 ` [PATCH 2/5] file-posix: fix max_iov for /dev/sg devices Paolo Bonzini
2021-05-18  8:38 ` [PATCH 3/5] block: feature detection for host block support Paolo Bonzini
2021-05-18  8:39 ` Paolo Bonzini [this message]
2021-05-18  8:39 ` [PATCH 5/5] block: detect DKIOCGETBLOCKCOUNT/SIZE before use Paolo Bonzini
2021-05-18 13:23 ` [PATCH 0/5] block: file-posix queue Kevin Wolf
2021-05-24 16:35   ` Paolo Bonzini

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=20210518083901.97369-5-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=j@getutm.app \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@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 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).