[v1,05/13] guestfs: Set storage options consistently

Commit Message

Chuck Lever March 10, 2025, 2:18 p.m. UTC

From: Chuck Lever <[e-mail]>

Clean up: The set-up for guestfs extra storage options is done
differently for each of the three libvirt storage choices. Ensure
that all three set the global variables consistently.

Signed-off-by: Chuck Lever <[e-mail]>
---
 kconfigs/Kconfig.libvirt                    |  3 +++
 playbooks/roles/gen_nodes/defaults/main.yml |  2 +-
 scripts/gen-nodes.Makefile                  | 10 ----------
 3 files changed, 4 insertions(+), 11 deletions(-)

Patch

diff --git a/kconfigs/Kconfig.libvirt b/kconfigs/Kconfig.libvirt
index e64db2b64c89..1ed967423096 100644
--- a/kconfigs/Kconfig.libvirt
+++ b/kconfigs/Kconfig.libvirt
@@ -528,6 +528,7 @@  choice
 
 config LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
 	bool "NVMe"
+	output yaml
 	help
 	  Use the QEMU NVMe driver for extra storage drives. We always expect
 	  to use this as we expect *could* be outperforming the virtio driver.
@@ -537,6 +538,7 @@  config LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
 
 config LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
 	bool "virtio"
+	output yaml
 	help
 	  Use the QEMU virtio driver for extra storage drives. Use this if you
 	  are having issues with "NVMe timeouts" issues when testing in a loop
@@ -545,6 +547,7 @@  config LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
 
 config LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
 	bool "ide"
+	output yaml
 	help
 	  Use the QEMU ide driver for extra storage drives. This is useful for
 	  really old Linux distributions that lack the virtio backend driver.
diff --git a/playbooks/roles/gen_nodes/defaults/main.yml b/playbooks/roles/gen_nodes/defaults/main.yml
index 00971e293d12..8ff9b87993a7 100644
--- a/playbooks/roles/gen_nodes/defaults/main.yml
+++ b/playbooks/roles/gen_nodes/defaults/main.yml
@@ -64,7 +64,7 @@  libvirt_enable_cxl_demo_topo2: False
 libvirt_enable_cxl_switch_topo1: False
 libvirt_enable_cxl_dcd_topo1: False
 libvirt_extra_drive_id_prefix: 'drv'
-libvirt_extra_storage_drive_nvme: True
+libvirt_extra_storage_drive_nvme: False
 libvirt_extra_storage_drive_virtio: False
 libvirt_extra_storage_drive_ide: False
 libvirt_extra_storage_aio_mode: "native"
diff --git a/scripts/gen-nodes.Makefile b/scripts/gen-nodes.Makefile
index ce6b794f1fb1..8bee2db57591 100644
--- a/scripts/gen-nodes.Makefile
+++ b/scripts/gen-nodes.Makefile
@@ -48,16 +48,6 @@  GEN_NODES_EXTRA_ARGS += libvirt_storage_pool_name='$(subst ",,$(CONFIG_LIBVIRT_S
 GEN_NODES_EXTRA_ARGS += libvirt_storage_pool_path='$(subst ",,$(CONFIG_KDEVOPS_STORAGE_POOL_PATH))'
 endif
 
-ifeq (y,$(CONFIG_LIBVIRT_EXTRA_STORAGE_DRIVE_IDE))
-GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_drive_nvme='False'
-GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_drive_ide='True'
-endif
-
-ifeq (y,$(CONFIG_LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO))
-GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_drive_nvme='False'
-GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_drive_virtio='True'
-endif
-
 GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_aio_mode='$(subst ",,$(CONFIG_LIBVIRT_AIO_MODE))'
 GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_aio_cache_mode='$(subst ",,$(CONFIG_LIBVIRT_AIO_CACHE_MODE))'