From: Jeff Layton <jlayton@kernel.org>
To: Luis Chamberlain <mcgrof@kernel.org>
Cc: kdevops@lists.linux.dev, Jeff Layton <jlayton@kernel.org>
Subject: [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/
Date: Fri, 08 Dec 2023 10:01:32 -0500 [thread overview]
Message-ID: <20231208-guestfs-v2-1-082c11a3a0af@kernel.org> (raw)
In-Reply-To: <20231208-guestfs-v2-0-082c11a3a0af@kernel.org>
The the libvirt Kconfig options that have VAGRANT in the name are really
all about libvirt and have little to do with vagrant at all. While we
need to replace vagrant, we want to keep a lot of the existing libvirt
handling code intact. This patch renames all of the options that have
VAGRANT_LIBVIRT into the name to just be LIBVIRT.
There should be no functional changes, but this may cause some options
that were set before to be lost on rename. I think however those losses
should be mostly benign. These two options should just end up defaulting
correctly if they are not set when the config is loaded:
VAGRANT_LIBVIRT => LIBVIRT
USE_VAGRANT_LIBVIRT_MIRROR => USE_LIBVIRT_MIRROR
The last three options are "firstrun" options that are usually not set
when we have an existing .config:
VAGRANT_LIBVIRT_INSTALL => LIBVIRT_INSTALL
VAGRANT_LIBVIRT_CONFIGURE => LIBVIRT_CONFIGURE
VAGRANT_LIBVIRT_VERIFY => LIBVIRT_VERIFY
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
Makefile.kdevops | 14 +++----
defconfigs/cxl-switch | 2 +-
scripts/bringup.Makefile | 6 +--
scripts/bringup_vagrant.sh | 6 +--
scripts/gen-nodes.Makefile | 2 +-
scripts/prune_stale_vagrant.sh | 2 +-
scripts/vagrant.Makefile | 10 ++---
vagrant/Kconfig | 48 +++++++++++-----------
.../xfs/unassigned/fstests-next-20230515 | 10 ++---
.../libvirt-qemu/20231003-huge/kdevops.config | 10 ++---
.../kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config | 10 ++---
.../tmpfs/libvirt-qemu/20231003/kdevops.config | 10 ++---
.../tmpfs/libvirt-qemu/20231004/kdevops.config | 10 ++---
.../tmpfs/libvirt-qemu/20231006/kdevops.config | 10 ++---
.../tmpfs/libvirt-qemu/20231009/kdevops.config | 10 ++---
.../tmpfs/libvirt-qemu/20231011/kdevops.config | 10 ++---
.../tmpfs/libvirt-qemu/20231012/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230522/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230725/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230727/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230728/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230731/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230807/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230811/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230817/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230825/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230828/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230829/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230903/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230909/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231023-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231023/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231024-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231024-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231026-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231026-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231027-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231030-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231030-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231030-0003/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231101-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231101-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231101-0003/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231102-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231102-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231103-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231103-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231104-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231105-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231106-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231106-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231106-0003/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231108-0001/kdevops.config | 10 ++---
.../tmpfs/libvirt-qemu/20231025/kdevops.config | 10 ++---
workflows/linux/Kconfig | 2 +-
workflows/linux/Kconfig.kdevops | 2 +-
workflows/linux/Kconfig.linus | 4 +-
workflows/linux/Kconfig.mcgrof | 4 +-
workflows/linux/Kconfig.next | 4 +-
workflows/linux/Kconfig.stable | 4 +-
60 files changed, 285 insertions(+), 285 deletions(-)
diff --git a/Makefile.kdevops b/Makefile.kdevops
index d07b69dc73c5..e58fe08a7a0d 100644
--- a/Makefile.kdevops
+++ b/Makefile.kdevops
@@ -21,13 +21,13 @@ kdevops_vagrant_install_vagrant:
$(KDEVOPS_PLAYBOOKS_DIR)/install_vagrant.yml \
-e 'ansible_python_interpreter=/usr/bin/python3'
-kdevops_vagrant_install_libvirt:
+kdevops_install_libvirt:
@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_configuration=True" \
-e 'ansible_python_interpreter=/usr/bin/python3'
-kdevops_vagrant_configure_libvirt:
+kdevops_configure_libvirt:
@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_install=True" \
@@ -36,8 +36,8 @@ kdevops_vagrant_configure_libvirt:
kdevops_vagrant_deps: \
kdevops_vagrant_install_vagrant \
- kdevops_vagrant_install_libvirt \
- kdevops_vagrant_configure_libvirt
+ kdevops_install_libvirt \
+ kdevops_configure_libvirt
PHONY += kdevops_vagrant_deps
KDEVOPS_VAGRANT_WORK := kdevops_vagrant_deps
@@ -50,14 +50,14 @@ kdevops_vagrant_boxes:
PHONY += kdevops_vagrant_boxes
KDEVOPS_VAGRANT_WORK += kdevops_vagrant_boxes
-kdevops_verify_vagrant_user:
+kdevops_verify_libvirt_user:
@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "only_verify_user=True" \
-e 'ansible_python_interpreter=/usr/bin/python3'
-PHONY += kdevops_verify_vagrant_user
-KDEVOPS_VAGRANT_WORK += kdevops_verify_vagrant_user
+PHONY += kdevops_verify_libvirt_user
+KDEVOPS_VAGRANT_WORK += kdevops_verify_libvirt_user
kdevops_libvirt_storage_pool_create:
@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
diff --git a/defconfigs/cxl-switch b/defconfigs/cxl-switch
index c5f8915584f3..6fcd1c5178ed 100644
--- a/defconfigs/cxl-switch
+++ b/defconfigs/cxl-switch
@@ -1,5 +1,5 @@
CONFIG_VAGRANT=y
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
CONFIG_QEMU_BUILD=y
CONFIG_QEMU_BIN_PATH_LIBVIRT="/usr/local/bin/qemu-system-x86_64"
CONFIG_QEMU_BUILD_JIC23=y
diff --git a/scripts/bringup.Makefile b/scripts/bringup.Makefile
index 0051bc3d5e0d..2219cb3f4342 100644
--- a/scripts/bringup.Makefile
+++ b/scripts/bringup.Makefile
@@ -4,11 +4,11 @@ ifeq (,$(wildcard $(CURDIR)/.config))
else
# stage-2-y targets gets called after all local config files have been generated
stage-2-$(CONFIG_TERRAFORM) += kdevops_terraform_deps
-stage-2-$(CONFIG_VAGRANT_LIBVIRT_INSTALL) += kdevops_vagrant_install_libvirt
-stage-2-$(CONFIG_VAGRANT_LIBVIRT_CONFIGURE) += kdevops_vagrant_configure_libvirt
+stage-2-$(CONFIG_LIBVIRT_INSTALL) += kdevops_install_libvirt
+stage-2-$(CONFIG_LIBVIRT_CONFIGURE) += kdevops_configure_libvirt
stage-2-$(CONFIG_VAGRANT) += kdevops_vagrant_install_vagrant
stage-2-$(CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES) += kdevops_vagrant_boxes
-stage-2-$(CONFIG_VAGRANT_LIBVIRT_VERIFY) += kdevops_verify_vagrant_user
+stage-2-$(CONFIG_LIBVIRT_VERIFY) += kdevops_verify_libvirt_user
stage-2-$(CONFIG_LIBVIRT_STORAGE_POOL_CREATE) += kdevops_libvirt_storage_pool_create
DEFAULT_DEPS += kdevops_stage_2
diff --git a/scripts/bringup_vagrant.sh b/scripts/bringup_vagrant.sh
index ad19d2980e4e..0ebcd4b3f4ba 100755
--- a/scripts/bringup_vagrant.sh
+++ b/scripts/bringup_vagrant.sh
@@ -23,10 +23,10 @@ get_canonical_version()
_vagrant_lacks_parallel()
{
PARALLEL_MISSING="0.7.0"
- VAGRANT_LIBVIRT_VERSION="$(vagrant plugin list | sed -e 's|(| |g' | sed -e 's|,| |g' | awk '{print $2}')"
+ LIBVIRT_VERSION="$(vagrant plugin list | sed -e 's|(| |g' | sed -e 's|,| |g' | awk '{print $2}')"
OLD=$(get_canonical_version $PARALLEL_MISSING)
- CURRENT=$(get_canonical_version $VAGRANT_LIBVIRT_VERSION)
+ CURRENT=$(get_canonical_version $LIBVIRT_VERSION)
if [[ "$CURRENT" -le "$OLD" ]]; then
return 1
fi
@@ -57,7 +57,7 @@ vagrant_check_dups()
kdevops_pool_path="$CONFIG_KDEVOPS_STORAGE_POOL_PATH"
# For libvirt we can do one more global sanity check
- if [[ "$CONFIG_VAGRANT_LIBVIRT" == "y" ]]; then
+ if [[ "$CONFIG_LIBVIRT" == "y" ]]; then
possible_image="${kdevops_pool_path}/vagrant_${instance}.img"
if [[ -f $possible_image ]]; then
echo "Image for instance $instance already exists ($possible_image), skippin bringup wipe of spare drives ..."
diff --git a/scripts/gen-nodes.Makefile b/scripts/gen-nodes.Makefile
index a4f42e64dd52..5c3f87ea100b 100644
--- a/scripts/gen-nodes.Makefile
+++ b/scripts/gen-nodes.Makefile
@@ -31,7 +31,7 @@ ifeq (y,$(CONFIG_LIBVIRT_HOST_PASSTHROUGH))
GEN_NODES_EXTRA_ARGS += libvirt_host_passthrough='True'
endif
-ifeq (y,$(CONFIG_VAGRANT_LIBVIRT))
+ifeq (y,$(CONFIG_LIBVIRT))
GEN_NODES_EXTRA_ARGS += libvirt_qemu_group='$(subst ",,$(CONFIG_LIBVIRT_QEMU_GROUP))'
endif
diff --git a/scripts/prune_stale_vagrant.sh b/scripts/prune_stale_vagrant.sh
index 012a0aaf08c3..95b88911c0a6 100755
--- a/scripts/prune_stale_vagrant.sh
+++ b/scripts/prune_stale_vagrant.sh
@@ -31,7 +31,7 @@ if [[ "$CONFIG_LIBVIRT_URI_SESSION" == "y" ]]; then
SUDO_REQ=""
fi
-if [[ "$CONFIG_VAGRANT_LIBVIRT" != "y" ]]; then
+if [[ "$CONFIG_LIBVIRT" != "y" ]]; then
echo "Only libvirt is supported at this time for this prune"
exit 1
fi
diff --git a/scripts/vagrant.Makefile b/scripts/vagrant.Makefile
index df0f68323c58..48d990321190 100644
--- a/scripts/vagrant.Makefile
+++ b/scripts/vagrant.Makefile
@@ -29,7 +29,7 @@ endif
VAGRANT_ARGS += kdevops_storage_pool_user='$(USER)'
-ifeq (y,$(CONFIG_VAGRANT_LIBVIRT))
+ifeq (y,$(CONFIG_LIBVIRT))
VAGRANT_ARGS += libvirt_provider=True
QEMU_GROUP:=$(subst ",,$(CONFIG_LIBVIRT_QEMU_GROUP))
@@ -51,9 +51,9 @@ ifeq (y,$(CONFIG_BOOTLINUX_9P))
VAGRANT_9P_HOST_CLONE := vagrant_9p_linux_clone
endif
-VAGRANT_LIBVIRT_PCIE_PASSTHROUGH :=
+LIBVIRT_PCIE_PASSTHROUGH :=
ifeq (y,$(CONFIG_KDEVOPS_LIBVIRT_PCIE_PASSTHROUGH))
-VAGRANT_LIBVIRT_PCIE_PASSTHROUGH := vagrant_libvirt_pcie_passthrough_permissions
+LIBVIRT_PCIE_PASSTHROUGH := libvirt_pcie_passthrough_permissions
endif
ifneq ($(strip $(CONFIG_VAGRANT_RHEL_ORG_ID)),)
@@ -71,7 +71,7 @@ ANSIBLE_EXTRA_ARGS += $(VAGRANT_ARGS)
VAGRANT_BRINGUP_DEPS :=
VAGRANT_BRINGUP_DEPS += $(VAGRANT_PRIVATE_BOX_DEPS)
VAGRANT_BRINGUP_DEPS += $(VAGRANT_9P_HOST_CLONE)
-VAGRANT_BRINGUP_DEPS += $(VAGRANT_LIBVIRT_PCIE_PASSTHROUGH)
+VAGRANT_BRINGUP_DEPS += $(LIBVIRT_PCIE_PASSTHROUGH)
KDEVOPS_BRING_UP_DEPS := bringup_vagrant
# Provisioning goes last
@@ -93,7 +93,7 @@ vagrant_private_box_install:
vagrant_9p_linux_clone:
$(Q)make linux-clone
-vagrant_libvirt_pcie_passthrough_permissions:
+libvirt_pcie_passthrough_permissions:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
playbooks/libvirt_pcie_passthrough.yml \
diff --git a/vagrant/Kconfig b/vagrant/Kconfig
index 3dd6d0cda2b1..3b069d098500 100644
--- a/vagrant/Kconfig
+++ b/vagrant/Kconfig
@@ -2,9 +2,9 @@ if VAGRANT
choice
prompt "Vagrant virtualization technology to use"
- default VAGRANT_LIBVIRT
+ default LIBVIRT
-config VAGRANT_LIBVIRT
+config LIBVIRT
bool "Libvirt"
help
Select this option if you want to use KVM / libvirt for
@@ -22,14 +22,14 @@ config VAGRANT_VIRTUALBOX
endchoice
-config USE_VAGRANT_LIBVIRT_MIRROR
+config USE_LIBVIRT_MIRROR
bool
default y if USE_LOCAL_LINUX_MIRROR
default n if !USE_LOCAL_LINUX_MIRROR
config VAGRANT_LARGE_CPU
bool "Enable extremely large CPU count"
- depends on VAGRANT_LIBVIRT
+ depends on LIBVIRT
help
Select this option if you want to enable larger CPUs
over what most KVM / libvirt configurations allow these days.
@@ -186,7 +186,7 @@ config VAGRANT_MEM_MB
help
How much MiB of RAM to use per guest.
-if VAGRANT_LIBVIRT
+if LIBVIRT
config HAVE_LIBVIRT_PCIE_PASSTHROUGH
bool
@@ -367,7 +367,7 @@ endchoice
choice
prompt "QEMU NVMe extra storage logical block size"
default LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_512
- depends on VAGRANT_LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
+ depends on LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
help
The logical block size to use for extra NVMe drives. This ends up
what is put into the /sys/block/<disk>/queue/logical_block_size (and
@@ -453,7 +453,7 @@ endchoice
choice
prompt "QEMU virtio extra storage physical block size"
- depends on VAGRANT_LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
+ depends on LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
default LIBVIRT_EXTRA_STORAGE_VIRTIO_PHYSICAL_BLOCK_SIZE_512
help
The physical block size to use for extra drive. This ends up
@@ -530,7 +530,7 @@ endchoice
choice
prompt "QEMU virtio extra storage logical block size"
- depends on VAGRANT_LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
+ depends on LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
default LIBVIRT_EXTRA_STORAGE_VIRTIO_LOGICAL_BLOCK_SIZE_512
help
The logical block size to use for extra drives. This ends up what is
@@ -1061,25 +1061,25 @@ config LIBVIRT_QEMU_GROUP
config KDEVOPS_STORAGE_POOL_PATH
string
- default LIBVIRT_STORAGE_POOL_PATH_AUTO if VAGRANT_LIBVIRT && !LIBVIRT_STORAGE_POOL_PATH_CUSTOM_MANUAL
- default LIBVIRT_STORAGE_POOL_PATH_AUTO if VAGRANT_LIBVIRT && LIBVIRT_STORAGE_POOL_PATH_CUSTOM_CWD
- default LIBVIRT_STORAGE_POOL_PATH_CUSTOM if VAGRANT_LIBVIRT && LIBVIRT_STORAGE_POOL_PATH_CUSTOM_MANUAL
+ default LIBVIRT_STORAGE_POOL_PATH_AUTO if LIBVIRT && !LIBVIRT_STORAGE_POOL_PATH_CUSTOM_MANUAL
+ default LIBVIRT_STORAGE_POOL_PATH_AUTO if LIBVIRT && LIBVIRT_STORAGE_POOL_PATH_CUSTOM_CWD
+ default LIBVIRT_STORAGE_POOL_PATH_CUSTOM if LIBVIRT && LIBVIRT_STORAGE_POOL_PATH_CUSTOM_MANUAL
default VIRTUALBOX_STORAGE_POOL_PATH_CUSTOM if VAGRANT_VIRTUALBOX
config QEMU_BIN_PATH
string
- default QEMU_BIN_PATH_LIBVIRT if VAGRANT_LIBVIRT
- default "/usr/bin/qemu-system-x86_64" if !VAGRANT_LIBVIRT
+ default QEMU_BIN_PATH_LIBVIRT if LIBVIRT
+ default "/usr/bin/qemu-system-x86_64" if !LIBVIRT
config LIBVIRT_URI
string
- default "qemu:///system" if !VAGRANT_LIBVIRT
- default LIBVIRT_URI_PATH if VAGRANT_LIBVIRT
+ default "qemu:///system" if !LIBVIRT
+ default LIBVIRT_URI_PATH if LIBVIRT
config LIBVIRT_SYSTEM_URI
string
- default "qemu:///system" if !VAGRANT_LIBVIRT
- default LIBVIRT_SYSTEM_URI_PATH if VAGRANT_LIBVIRT
+ default "qemu:///system" if !LIBVIRT
+ default LIBVIRT_SYSTEM_URI_PATH if LIBVIRT
config LIBVIRT_SESSION
bool
@@ -1304,7 +1304,7 @@ config VAGRANT_BOX_VERSION
endif # !HAVE_VAGRANT_BOX_VERSION
-config VAGRANT_LIBVIRT_INSTALL
+config LIBVIRT_INSTALL
bool "Install libvirt"
default y if KDEVOPS_FIRST_RUN
default n if !KDEVOPS_FIRST_RUN
@@ -1313,7 +1313,7 @@ config VAGRANT_LIBVIRT_INSTALL
libvirt for you will be run. The goal will be to ensure you have
libvirt installed and running.
-config VAGRANT_LIBVIRT_CONFIGURE
+config LIBVIRT_CONFIGURE
bool "Configure libvirt so you spawn guests as a regular user"
default y if KDEVOPS_FIRST_RUN
default n if !KDEVOPS_FIRST_RUN
@@ -1328,7 +1328,7 @@ config VAGRANT_LIBVIRT_CONFIGURE
the litmus test for this is if you can run vagrant up, on any public
demo box available.
-config VAGRANT_LIBVIRT_VERIFY
+config LIBVIRT_VERIFY
bool "Verify that a user can spawn libvirt as a regular user"
default y if KDEVOPS_FIRST_RUN
default n if !KDEVOPS_FIRST_RUN
@@ -1354,7 +1354,7 @@ config VAGRANT_INSTALL_PRIVATE_BOXES
choice
prompt "Libvirt NVMe drive file format"
- depends on VAGRANT_LIBVIRT
+ depends on LIBVIRT
default LIBVIRT_NVME_DRIVE_FORMAT_RAW
config LIBVIRT_NVME_DRIVE_FORMAT_QCOW2
@@ -1391,7 +1391,7 @@ endchoice
config QEMU_ENABLE_NVME_ZNS
bool "Enable QEMU NVMe ZNS drives"
- depends on VAGRANT_LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
+ depends on LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
default n
help
If this option is enabled then you can enable NVMe ZNS drives on the
@@ -1538,7 +1538,7 @@ config QEMU_NVME_ZONE_LOGICAL_BLOCK_SIZE
config QEMU_ENABLE_EXTRA_DRIVE_LARGEIO
bool "Enable QEMU drives for large IO experimentation"
- depends on VAGRANT_LIBVIRT
+ depends on LIBVIRT
default n
help
If you want to experiment with large IO either with NVMe or virtio
@@ -1669,7 +1669,7 @@ config QEMU_LARGEIO_MAX_POW_LIMIT
config QEMU_ENABLE_CXL
bool "Enable QEMU CXL devices"
- depends on VAGRANT_LIBVIRT
+ depends on LIBVIRT
depends on LIBVIRT_MACHINE_TYPE_Q35
depends on QEMU_USE_DEVELOPMENT_VERSION
default n
diff --git a/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515 b/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515
index bc4f47cf25cd..6eca806ba04b 100644
--- a/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515
+++ b/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515
@@ -38,9 +38,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -110,9 +110,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config
index 78f87387b0f0..7a45735500a4 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config
index 7940bb5a3d8d..7d116643907f 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config
index 78f87387b0f0..7a45735500a4 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config
index 0940704d8657..81be55c6e00e 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231006/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231006/kdevops.config
index df704daf3cd7..32847ddaf4d0 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231006/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231006/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231009/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231009/kdevops.config
index df704daf3cd7..32847ddaf4d0 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231009/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231009/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231011/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231011/kdevops.config
index 582837072c91..1ed75d037a92 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231011/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231011/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231012/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231012/kdevops.config
index 4f770ddea93d..01de380f9df1 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231012/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231012/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/xfs/libvirt-qemu/20230522/kdevops.config b/workflows/fstests/results/archive/dagomez/xfs/libvirt-qemu/20230522/kdevops.config
index 5d528a823cd8..6937464d450f 100644
--- a/workflows/fstests/results/archive/dagomez/xfs/libvirt-qemu/20230522/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/xfs/libvirt-qemu/20230522/kdevops.config
@@ -38,9 +38,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -110,9 +110,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230725/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230725/kdevops.config
index c70f944ecb0b..1f174178896a 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230725/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230725/kdevops.config
@@ -38,9 +38,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -1724,9 +1724,9 @@ CONFIG_VAGRANT_KDEVOPS_DEBIAN_TESTING64_XFS_20230427=y
CONFIG_VAGRANT_BOX="linux-kdevops/debian-xfs-20230427"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230727/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230727/kdevops.config
index 13feaf486ce7..9097c9d9f2ae 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230727/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230727/kdevops.config
@@ -38,9 +38,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -132,9 +132,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230728/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230728/kdevops.config
index 13feaf486ce7..9097c9d9f2ae 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230728/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230728/kdevops.config
@@ -38,9 +38,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -132,9 +132,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230731/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230731/kdevops.config
index 827d7f64c573..68e320322aec 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230731/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230731/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230807/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230807/kdevops.config
index 521fde1c6360..fd65bdcbedfe 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230807/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230807/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230811/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230811/kdevops.config
index 521fde1c6360..fd65bdcbedfe 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230811/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230811/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230817/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230817/kdevops.config
index 521fde1c6360..fd65bdcbedfe 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230817/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230817/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230825/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230825/kdevops.config
index 521fde1c6360..fd65bdcbedfe 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230825/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230825/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230828/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230828/kdevops.config
index 521fde1c6360..fd65bdcbedfe 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230828/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230828/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230829/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230829/kdevops.config
index 521fde1c6360..fd65bdcbedfe 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230829/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230829/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230903/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230903/kdevops.config
index 9d8035a97478..9bb6df992a44 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230903/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230903/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -137,9 +137,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230909/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230909/kdevops.config
index 52bf584c0044..65d6fcac157c 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230909/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230909/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -1752,9 +1752,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023-0001/kdevops.config
index e80caf9cd832..71b26e3d1598 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023/kdevops.config
index 574552d4b00f..704d0bfb58c6 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0001/kdevops.config
index 5d9be3f6b7ff..298ccc33a5e6 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0002/kdevops.config
index 574552d4b00f..704d0bfb58c6 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0001/kdevops.config
index 574552d4b00f..704d0bfb58c6 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0002/kdevops.config
index 5d9be3f6b7ff..298ccc33a5e6 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231027-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231027-0001/kdevops.config
index 574552d4b00f..704d0bfb58c6 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231027-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231027-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0001/kdevops.config
index 4a8b87007025..a4b4b5e0057e 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0002/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0003/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0003/kdevops.config
index e6023f8bb2ae..5c7ec8b58686 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0003/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0003/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0001/kdevops.config
index e6023f8bb2ae..5c7ec8b58686 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0002/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0003/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0003/kdevops.config
index 4a8b87007025..a4b4b5e0057e 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0003/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0003/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0001/kdevops.config
index 4a8b87007025..a4b4b5e0057e 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0002/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0001/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0002/kdevops.config
index d47107338854..8eded9924a37 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231104-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231104-0001/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231104-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231104-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231105-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231105-0001/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231105-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231105-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0001/kdevops.config
index e6023f8bb2ae..5c7ec8b58686 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0002/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0003/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0003/kdevops.config
index d47107338854..8eded9924a37 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0003/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0003/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231108-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231108-0001/kdevops.config
index e6023f8bb2ae..5c7ec8b58686 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231108-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231108-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/dagmcr/tmpfs/libvirt-qemu/20231025/kdevops.config b/workflows/fstests/results/dagmcr/tmpfs/libvirt-qemu/20231025/kdevops.config
index 747ee857ea5d..bfe0615f259f 100644
--- a/workflows/fstests/results/dagmcr/tmpfs/libvirt-qemu/20231025/kdevops.config
+++ b/workflows/fstests/results/dagmcr/tmpfs/libvirt-qemu/20231025/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/linux/Kconfig b/workflows/linux/Kconfig
index 88e0f0eab60f..8606f0f8b179 100644
--- a/workflows/linux/Kconfig
+++ b/workflows/linux/Kconfig
@@ -28,7 +28,7 @@ endif # HAVE_SUPPORTS_PURE_IOMAP
config BOOTLINUX_9P
bool "Use 9p to build Linux"
- depends on VAGRANT_LIBVIRT
+ depends on LIBVIRT
depends on LIBVIRT_MACHINE_TYPE_Q35
default LIBVIRT_MACHINE_TYPE_Q35
help
diff --git a/workflows/linux/Kconfig.kdevops b/workflows/linux/Kconfig.kdevops
index b0cef298774f..4cb8388b108e 100644
--- a/workflows/linux/Kconfig.kdevops
+++ b/workflows/linux/Kconfig.kdevops
@@ -14,7 +14,7 @@ endchoice
config BOOTLINUX_TREE_KDEVOPS_URL
string
default "https://github.com/linux-kdevops/linux.git" if !USE_LOCAL_LINUX_MIRROR
- default "/mirror/kdevops-linus.git" if USE_VAGRANT_LIBVIRT_MIRROR && BOOTLINUX_9P
+ default "/mirror/kdevops-linus.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
config BOOTLINUX_KDEVOPS_TREE_TAG
string
diff --git a/workflows/linux/Kconfig.linus b/workflows/linux/Kconfig.linus
index 28352e14ee41..b1e03c6a0871 100644
--- a/workflows/linux/Kconfig.linus
+++ b/workflows/linux/Kconfig.linus
@@ -63,8 +63,8 @@ config BOOTLINUX_TREE_LINUS_NAME
config BOOTLINUX_TREE_LINUS_URL
string
default "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" if !USE_LOCAL_LINUX_MIRROR
- default "git://192.168.124.1/mirror/linux.git" if USE_VAGRANT_LIBVIRT_MIRROR && !BOOTLINUX_9P
- default "/mirror/linux.git" if USE_VAGRANT_LIBVIRT_MIRROR && BOOTLINUX_9P
+ default "git://192.168.124.1/mirror/linux.git" if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P
+ default "/mirror/linux.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
endif # BOOTLINUX_TREE_LINUS
diff --git a/workflows/linux/Kconfig.mcgrof b/workflows/linux/Kconfig.mcgrof
index c4720003c6b4..4c4be5b72aff 100644
--- a/workflows/linux/Kconfig.mcgrof
+++ b/workflows/linux/Kconfig.mcgrof
@@ -62,8 +62,8 @@ config BOOTLINUX_MCGROF_TREE_NAME
config BOOTLINUX_MCGROF_TREE_URL
string
default "https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux-next.git" if BOOTLINUX_TREE_MCGROF_NEXT && !USE_LOCAL_LINUX_MIRROR
- default "/mirror/mcgrof-next.git" if BOOTLINUX_TREE_MCGROF_NEXT && USE_VAGRANT_LIBVIRT_MIRROR && BOOTLINUX_9P
+ default "/mirror/mcgrof-next.git" if BOOTLINUX_TREE_MCGROF_NEXT && USE_LIBVIRT_MIRROR && BOOTLINUX_9P
default "https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git" if BOOTLINUX_TREE_MCGROF_LINUS && !USE_LOCAL_LINUX_MIRROR
- default "/mirror/mcgrof-linus.git" if BOOTLINUX_TREE_MCGROF_LINUS && USE_VAGRANT_LIBVIRT_MIRROR && BOOTLINUX_9P
+ default "/mirror/mcgrof-linus.git" if BOOTLINUX_TREE_MCGROF_LINUS && USE_LIBVIRT_MIRROR && BOOTLINUX_9P
endif # BOOTLINUX_TREE_MCGROF_LINUS || BOOTLINUX_TREE_MCGROF_NEXT
diff --git a/workflows/linux/Kconfig.next b/workflows/linux/Kconfig.next
index ba9eaf31df68..ab839ff9d1cf 100644
--- a/workflows/linux/Kconfig.next
+++ b/workflows/linux/Kconfig.next
@@ -11,7 +11,7 @@ config BOOTLINUX_TREE_NEXT_NAME
config BOOTLINUX_TREE_NEXT_URL
string
default "https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git" if !USE_LOCAL_LINUX_MIRROR
- default "git://192.168.124.1/mirror/linux-next.git" if USE_VAGRANT_LIBVIRT_MIRROR && !BOOTLINUX_9P
- default "/mirror/linux-next.git" if USE_VAGRANT_LIBVIRT_MIRROR && BOOTLINUX_9P
+ default "git://192.168.124.1/mirror/linux-next.git" if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P
+ default "/mirror/linux-next.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
endif # BOOTLINUX_TREE_NEXT
diff --git a/workflows/linux/Kconfig.stable b/workflows/linux/Kconfig.stable
index 2d1be22e837d..88fb34cbd8a9 100644
--- a/workflows/linux/Kconfig.stable
+++ b/workflows/linux/Kconfig.stable
@@ -79,7 +79,7 @@ config BOOTLINUX_TREE_STABLE_NAME
config BOOTLINUX_TREE_STABLE_URL
string
default "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git" if !USE_LOCAL_LINUX_MIRROR
- default "git://192.168.124.1/mirror/linux-stable.git" if USE_VAGRANT_LIBVIRT_MIRROR && !BOOTLINUX_9P
- default "/mirror/linux-stable.git" if USE_VAGRANT_LIBVIRT_MIRROR && BOOTLINUX_9P
+ default "git://192.168.124.1/mirror/linux-stable.git" if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P
+ default "/mirror/linux-stable.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
endif # BOOTLINUX_STABLE
--
2.43.0
next prev parent reply other threads:[~2023-12-08 15:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-08 15:01 [PATCH kdevops v2 0/4] guestfs: replacement for vagrant in kdevops Jeff Layton
2023-12-08 15:01 ` Jeff Layton [this message]
2023-12-09 2:05 ` [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/ Luis Chamberlain
2023-12-09 2:06 ` Luis Chamberlain
2023-12-09 2:08 ` Luis Chamberlain
2023-12-09 12:07 ` Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 2/4] nfsd: key off of LIBVIRT instead of VAGRANT for storage config Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 3/4] vagrant: rename the RHEL registration settings Jeff Layton
2023-12-08 15:23 ` Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 4/4] guestfs: add a new local guest management variant Jeff Layton
2023-12-09 2:14 ` Luis Chamberlain
2023-12-09 12:25 ` Jeff Layton
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=20231208-guestfs-v2-1-082c11a3a0af@kernel.org \
--to=jlayton@kernel.org \
--cc=kdevops@lists.linux.dev \
--cc=mcgrof@kernel.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