[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 1/9] configure: option to disable host block devices
From: |
Joelle van Dyne |
Subject: |
[PATCH v2 1/9] configure: option to disable host block devices |
Date: |
Sun, 18 Oct 2020 18:39:20 -0700 |
From: osy <osy86@users.noreply.github.com>
Some hosts (iOS) have a sandboxed filesystem and do not provide low-level
APIs for interfacing with host block devices.
Signed-off-by: Joelle van Dyne <j@getutm.app>
---
configure | 4 ++++
meson.build | 1 +
block/file-posix.c | 8 +++++++-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index b553288c5e..3c63879750 100755
--- a/configure
+++ b/configure
@@ -446,6 +446,7 @@ meson=""
ninja=""
skip_meson=no
gettext=""
+host_block_device_support="yes"
bogus_os="no"
malloc_trim="auto"
@@ -6098,6 +6099,9 @@ if test "$default_devices" = "yes" ; then
else
echo "CONFIG_MINIKCONF_MODE=--allnoconfig" >> $config_host_mak
fi
+if test "$host_block_device_support" = "yes" ; then
+ echo "CONFIG_HOST_BLOCK_DEVICE=y" >> $config_host_mak
+fi
if test "$debug_tcg" = "yes" ; then
echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index 17c89c87c6..5d3a47784b 100644
--- a/meson.build
+++ b/meson.build
@@ -1947,6 +1947,7 @@ summary_info += {'vvfat support':
config_host.has_key('CONFIG_VVFAT')}
summary_info += {'qed support': config_host.has_key('CONFIG_QED')}
summary_info += {'parallels support': config_host.has_key('CONFIG_PARALLELS')}
summary_info += {'sheepdog support': config_host.has_key('CONFIG_SHEEPDOG')}
+summary_info += {'host block dev support':
config_host.has_key('CONFIG_HOST_BLOCK_DEVICE')}
summary_info += {'capstone': capstone_opt == 'disabled' ? false :
capstone_opt}
summary_info += {'libpmem support': config_host.has_key('CONFIG_LIBPMEM')}
summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
diff --git a/block/file-posix.c b/block/file-posix.c
index c63926d592..52f7c20525 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -41,7 +41,7 @@
#include "scsi/pr-manager.h"
#include "scsi/constants.h"
-#if defined(__APPLE__) && (__MACH__)
+#if defined(CONFIG_HOST_BLOCK_DEVICE) && defined(__APPLE__) && (__MACH__)
#include <paths.h>
#include <sys/param.h>
#include <IOKit/IOKitLib.h>
@@ -3247,6 +3247,8 @@ BlockDriver bdrv_file = {
/***********************************************/
/* host device */
+#if defined(CONFIG_HOST_BLOCK_DEVICE)
+
#if defined(__APPLE__) && defined(__MACH__)
static kern_return_t GetBSDPath(io_iterator_t mediaIterator, char *bsdPath,
CFIndex maxPathSize, int flags);
@@ -3872,6 +3874,8 @@ static BlockDriver bdrv_host_cdrom = {
};
#endif /* __FreeBSD__ */
+#endif /* CONFIG_HOST_BLOCK_DEVICE */
+
static void bdrv_file_init(void)
{
/*
@@ -3879,6 +3883,7 @@ static void bdrv_file_init(void)
* registered last will get probed first.
*/
bdrv_register(&bdrv_file);
+#if defined(CONFIG_HOST_BLOCK_DEVICE)
bdrv_register(&bdrv_host_device);
#ifdef __linux__
bdrv_register(&bdrv_host_cdrom);
@@ -3886,6 +3891,7 @@ static void bdrv_file_init(void)
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
bdrv_register(&bdrv_host_cdrom);
#endif
+#endif /* CONFIG_HOST_BLOCK_DEVICE */
}
block_init(bdrv_file_init);
--
2.24.3 (Apple Git-128)
- Re: [PATCH v2 2/9] configure: cross-compiling without cross_prefix, (continued)
- Re: [PATCH v2 2/9] configure: cross-compiling without cross_prefix, Thomas Huth, 2020/10/19
- Re: [PATCH v2 2/9] configure: cross-compiling without cross_prefix, BALATON Zoltan, 2020/10/19
- Re: [PATCH v2 2/9] configure: cross-compiling without cross_prefix, Joelle van Dyne, 2020/10/19
- Re: [PATCH v2 2/9] configure: cross-compiling without cross_prefix, Thomas Huth, 2020/10/20
- Re: [PATCH v2 2/9] configure: cross-compiling without cross_prefix, Paolo Bonzini, 2020/10/20
- Re: [PATCH v2 2/9] configure: cross-compiling without cross_prefix, Joelle van Dyne, 2020/10/25
- Re: [PATCH v2 2/9] configure: cross-compiling without cross_prefix, Paolo Bonzini, 2020/10/26
- Re: [PATCH v2 2/9] configure: cross-compiling without cross_prefix, Joelle van Dyne, 2020/10/26
- Re: [PATCH v2 2/9] configure: cross-compiling without cross_prefix, Paolo Bonzini, 2020/10/26
- Re: [PATCH v2 2/9] configure: cross-compiling without cross_prefix, Thomas Huth, 2020/10/26
[PATCH v2 1/9] configure: option to disable host block devices,
Joelle van Dyne <=
[PATCH v2 4/9] coroutine: add libucontext as external library, Joelle van Dyne, 2020/10/18
[PATCH v2 3/9] qemu: add support for iOS host, Joelle van Dyne, 2020/10/18
[PATCH v2 7/9] tcg: mirror mapping RWX pages for iOS optional, Joelle van Dyne, 2020/10/18
[PATCH v2 5/9] tcg: add const hints for code pointers, Joelle van Dyne, 2020/10/18