[PATCH 08/13] qemu: infer QEMU_USE_DEVELOPMENT_VERSION from CONFIG_QEMU

From: Daniel Gomez <[email protected]>

Drop support for the the case were we configure to build a custom QEMU
but we do not want to use it.

Signed-off-by: Daniel Gomez <[email protected]>
---
 defconfigs/cxl-switch        |  1 -
 kconfigs/Kconfig.libvirt     | 12 ++++++------
 kconfigs/Kconfig.libvirt.cxl |  2 +-
 kconfigs/Kconfig.qemu        | 17 -----------------
 4 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/defconfigs/cxl-switch b/defconfigs/cxl-switch
index 50d10343..ac17613d 100644
--- a/defconfigs/cxl-switch
+++ b/defconfigs/cxl-switch
@@ -3,7 +3,6 @@ CONFIG_LIBVIRT=y
 CONFIG_QEMU=y
 CONFIG_QEMU_BIN_PATH_LIBVIRT="/usr/local/bin/qemu-system-x86_64"
 CONFIG_QEMU_JIC23=y
-CONFIG_QEMU_USE_DEVELOPMENT_VERSION=y
 CONFIG_QEMU_GIT="https://gitlab.com/jic23/qemu.git"
 CONFIG_QEMU_GIT_DATA_PATH="{{local_dev_path}}/qemu"
 CONFIG_QEMU_GIT_VERSION="cxl-2023-11-02"
diff --git a/kconfigs/Kconfig.libvirt b/kconfigs/Kconfig.libvirt
index 13a14156..2bacce8b 100644
--- a/kconfigs/Kconfig.libvirt
+++ b/kconfigs/Kconfig.libvirt
@@ -204,12 +204,12 @@ config USE_LIBVIRT_MIRROR
 
 config QEMU_BIN_PATH_LIBVIRT
 	string "QEMU binary path to use"
-	default "/usr/local/bin/qemu-system-x86_64" if QEMU_USE_DEVELOPMENT_VERSION && TARGET_ARCH_X86_64
-	default "/usr/local/bin/qemu-system-aarch64" if QEMU_USE_DEVELOPMENT_VERSION && TARGET_ARCH_ARM64
-	default "/usr/local/bin/qemu-system-ppc64le" if QEMU_USE_DEVELOPMENT_VERSION && TARGET_ARCH_PPC64LE
-	default "/usr/bin/qemu-system-x86_64" if !QEMU_USE_DEVELOPMENT_VERSION && TARGET_ARCH_X86_64
-	default "/usr/bin/qemu-system-aarch64" if !QEMU_USE_DEVELOPMENT_VERSION && TARGET_ARCH_ARM64
-	default "/usr/bin/qemu-system-ppc64le" if !QEMU_USE_DEVELOPMENT_VERSION && TARGET_ARCH_PPC64LE
+	default "/usr/local/bin/qemu-system-x86_64" if QEMU && TARGET_ARCH_X86_64
+	default "/usr/local/bin/qemu-system-aarch64" if QEMU && TARGET_ARCH_ARM64
+	default "/usr/local/bin/qemu-system-ppc64le" if QEMU && TARGET_ARCH_PPC64LE
+	default "/usr/bin/qemu-system-x86_64" if !QEMU && TARGET_ARCH_X86_64
+	default "/usr/bin/qemu-system-aarch64" if !QEMU && TARGET_ARCH_ARM64
+	default "/usr/bin/qemu-system-ppc64le" if !QEMU && TARGET_ARCH_PPC64LE
 
 config QEMU_VIRSH_CAN_SUDO
 	bool
diff --git a/kconfigs/Kconfig.libvirt.cxl b/kconfigs/Kconfig.libvirt.cxl
index 313e0ba0..eea9fe00 100644
--- a/kconfigs/Kconfig.libvirt.cxl
+++ b/kconfigs/Kconfig.libvirt.cxl
@@ -4,7 +4,7 @@ config QEMU_ENABLE_CXL
 	depends on LIBVIRT
 	depends on LIBVIRT_MACHINE_TYPE_Q35
 	depends on BRINGUP_SUPPORTS_CXL
-	depends on QEMU_USE_DEVELOPMENT_VERSION
+	depends on QEMU
 	default n
 	help
 	  If this option is enabled then you can enable different types of
diff --git a/kconfigs/Kconfig.qemu b/kconfigs/Kconfig.qemu
index 1b61630b..0c0b73e1 100644
--- a/kconfigs/Kconfig.qemu
+++ b/kconfigs/Kconfig.qemu
@@ -7,19 +7,6 @@ config QEMU
 	  relying on technology is still under development or if you have
 	  a custom QEMU git URL.
 
-if !QEMU
-
-config QEMU_USE_DEVELOPMENT_VERSION
-	bool "Should we look for a development version of QEMU?"
-	help
-	  You want to enable this option if for example the currently
-	  available version of QEMU does not yet have support for the feature
-	  you are going to be working on.
-
-	  Say yes here if you are compiling your own version of QEMU.
-
-endif # !QEMU
-
 if QEMU
 
 choice
@@ -77,10 +64,6 @@ config QEMU_GIT_VERSION
 	  recent release as the fallback when no mirror is present. Override it
 	  to pin a specific tag or branch.
 
-config QEMU_USE_DEVELOPMENT_VERSION
-	bool
-	default y
-
 config QEMU_TARGET
 	string
 	output yaml

-- 
2.54.0