| Message ID | 20210122201113.63788-4-j@getutm.app (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iOS and Apple Silicon host support | expand |
On Fri, 22 Jan 2021 at 20:13, Joelle van Dyne <j@getutm.app> wrote: > > Some BSD platforms do not have this header. > > Signed-off-by: Joelle van Dyne <j@getutm.app> > --- > configure | 9 +++++++++ > block.c | 2 +- > block/file-posix.c | 2 +- > 3 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 32be5d225d..951de427bb 100755 > --- a/configure > +++ b/configure > @@ -5295,6 +5295,12 @@ else > have_host_block_device=no > fi > > +if check_include "sys/disk.h" ; then > + sys_disk_h=yes > +else > + sys_disk_h=no > +fi > + > ########################################## > # End of CC checks > # After here, no more $cc or $ld runs > @@ -5528,6 +5534,9 @@ echo "ARCH=$ARCH" >> $config_host_mak > if test "$have_host_block_device" = "yes" ; then > echo "HAVE_HOST_BLOCK_DEVICE=y" >> $config_host_mak > fi > +if test "$sys_disk_h" = "yes" ; then > + echo "HAVE_SYS_DISK_H=y" >> $config_host_mak > +fi > if test "$debug_tcg" = "yes" ; then > echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak > fi We should do this check in meson.build, where it is a one-liner: config_host_data.set('HAVE_SYS_DISK_H', cc.has_header('sys/disk.h')) (compare the existing HAVE_PTY_H etc). thanks -- PMM
diff --git a/configure b/configure index 32be5d225d..951de427bb 100755 --- a/configure +++ b/configure @@ -5295,6 +5295,12 @@ else have_host_block_device=no fi +if check_include "sys/disk.h" ; then + sys_disk_h=yes +else + sys_disk_h=no +fi + ########################################## # End of CC checks # After here, no more $cc or $ld runs @@ -5528,6 +5534,9 @@ echo "ARCH=$ARCH" >> $config_host_mak if test "$have_host_block_device" = "yes" ; then echo "HAVE_HOST_BLOCK_DEVICE=y" >> $config_host_mak fi +if test "$sys_disk_h" = "yes" ; then + echo "HAVE_SYS_DISK_H=y" >> $config_host_mak +fi if test "$debug_tcg" = "yes" ; then echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak fi 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;
Some BSD platforms do not have this header. Signed-off-by: Joelle van Dyne <j@getutm.app> --- configure | 9 +++++++++ block.c | 2 +- block/file-posix.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-)