From: Michalis Pappas <michalis@unikraft.io>
Date: Mon, 14 Aug 2023 14:07:15 +0000 (+0200)
Subject: plat/kvm/arm: Fix default choice in arm64 VMM menu
X-Git-Tag: RELEASE-0.14.0~25
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=38d565587d9d4c7bc2532b73a4bc01b1189b8588;p=unikraft%2Funikraft.git

plat/kvm/arm: Fix default choice in arm64 VMM menu

Fix the default selection of the VMM in Config.uk. Kconfig requires
that the default is defined as an attribute of the `choice` option
rather than the contained item.

Signed-off-by: Michalis Pappas <michalis@unikraft.io>
Reviewed-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Reviewed-by: Maria Sfiraiala <maria.sfiraiala@gmail.com>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #1053
---

diff --git a/plat/kvm/Config.uk b/plat/kvm/Config.uk
index 097536458..d7c30151b 100644
--- a/plat/kvm/Config.uk
+++ b/plat/kvm/Config.uk
@@ -16,6 +16,7 @@ if (PLAT_KVM)
 
 choice
 	prompt "Boot protocol"
+	default KVM_BOOT_PROTO_LXBOOT
 
 config KVM_BOOT_PROTO_MULTIBOOT
 	bool "Multiboot"
@@ -25,7 +26,6 @@ config KVM_BOOT_PROTO_MULTIBOOT
 
 config KVM_BOOT_PROTO_LXBOOT
 	bool "Lxboot"
-	default y
 	depends on KVM_VMM_FIRECRACKER || (KVM_VMM_QEMU && ARCH_ARM_64)
 	help
 		Linux 64-bit Boot Protocol