[PATCH 2/8] bringup: disable ZNS and CXL for guestfs

[Luis Chamberlain <mcgrof@kernel.org>]

Support for things like ZNS and CXL require libvirt XML macros to be
developed for guestfs and this is not ready yet, so hide support for it
under options which make it clear these features are still missing for
guestfs.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 kconfigs/Kconfig.bringup       | 7 +++++++
 kconfigs/Kconfig.extra_storage | 6 ++++++
 kconfigs/Kconfig.libvirt       | 9 +++++++++
 3 files changed, 22 insertions(+)

diff --git a/kconfigs/Kconfig.bringup b/kconfigs/Kconfig.bringup
index ba7b5430..de4128ae 100644
--- a/kconfigs/Kconfig.bringup
+++ b/kconfigs/Kconfig.bringup
@@ -1,3 +1,6 @@
+config BRINGUP_SUPPORTS_CXL
+	bool
+
 choice
 	prompt "Node bring up method"
 	default VAGRANT
@@ -5,6 +8,9 @@ choice
 config VAGRANT
 	bool "Vagrant for local virtualization (KVM / VirtualBox)"
 	select KDEVOPS_SSH_CONFIG_UPDATE_STRICT
+	select EXTRA_STORAGE_SUPPORTS_ZNS
+	select EXTRA_STORAGE_SUPPORTS_LARGEIO
+	select BRINGUP_SUPPORTS_CXL
 	depends on TARGET_ARCH_X86_64
 	help
 	  This option will enable use of Vagrant. Enable this if you want to
@@ -17,6 +23,7 @@ config VAGRANT
 
 config GUESTFS
 	bool "Use guestfs-tools for local virtualization via KVM and libvirt (EXPERIMENTAL)"
+	select EXTRA_STORAGE_SUPPORTS_LARGEIO
 	help
 	  This option will use libguestfs utilities instead of Vagrant to build
 	  guest images and spin them up using libvirt with KVM.
diff --git a/kconfigs/Kconfig.extra_storage b/kconfigs/Kconfig.extra_storage
index 12bb4206..7b0df9a1 100644
--- a/kconfigs/Kconfig.extra_storage
+++ b/kconfigs/Kconfig.extra_storage
@@ -13,3 +13,9 @@ config EXTRA_STORAGE_SUPPORTS_2K
 config EXTRA_STORAGE_SUPPORTS_4K
 	bool
 	default n
+config EXTRA_STORAGE_SUPPORTS_ZNS
+	bool
+	default n
+config EXTRA_STORAGE_SUPPORTS_LARGEIO
+	bool
+	default n
diff --git a/kconfigs/Kconfig.libvirt b/kconfigs/Kconfig.libvirt
index d8b972c1..7486be49 100644
--- a/kconfigs/Kconfig.libvirt
+++ b/kconfigs/Kconfig.libvirt
@@ -1091,6 +1091,8 @@ config LIBVIRT_STORAGE_POOL_NAME
 	  For instance you may want to use a volume name of "data2" for a path
 	  on a partition on /data2/ or something like that.
 
+if EXTRA_STORAGE_SUPPORTS_ZNS
+
 config QEMU_ENABLE_NVME_ZNS
 	bool "Enable QEMU NVMe ZNS drives"
 	depends on LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
@@ -1238,6 +1240,10 @@ config QEMU_NVME_ZONE_LOGICAL_BLOCK_SIZE
 	default 4096 if !QEMU_CUSTOM_NVME_ZNS
 	default QEMU_CUSTOM_NVME_ZONE_LOGICAL_BLOCK_SIZE if QEMU_CUSTOM_NVME_ZNS
 
+endif # EXTRA_STORAGE_SUPPORTS_ZNS
+
+if EXTRA_STORAGE_SUPPORTS_LARGEIO
+
 config QEMU_ENABLE_EXTRA_DRIVE_LARGEIO
 	bool "Enable QEMU drives for large IO experimentation"
 	depends on LIBVIRT
@@ -1369,10 +1375,13 @@ config QEMU_LARGEIO_MAX_POW_LIMIT
 	default 12 if !QEMU_ENABLE_EXTRA_DRIVE_LARGEIO
 	default QEMU_EXTRA_DRIVE_LARGEIO_MAX_POW_LIMIT if QEMU_ENABLE_EXTRA_DRIVE_LARGEIO
 
+endif # EXTRA_STORAGE_SUPPORTS_LARGEIO
+
 config QEMU_ENABLE_CXL
 	bool "Enable QEMU CXL devices"
 	depends on LIBVIRT
 	depends on LIBVIRT_MACHINE_TYPE_Q35
+	depends on BRINGUP_SUPPORTS_CXL
 	depends on QEMU_USE_DEVELOPMENT_VERSION
 	default n
 	help
-- 
2.43.0