From 64bbd37fd7b122cc1ea6eed76fb2939fc5995108 Mon Sep 17 00:00:00 2001 From: Victor Sun Date: Mon, 9 Dec 2019 12:55:42 +0800 Subject: [PATCH] HV: Kconfig: set default Kata num to 1 in SDC Set default CONFIG_KATA_VM_NUM to 1 in SDC scenario so that user could have a try on Kata container without rebuilding hypervisor. Please be aware that vcpu affinity of VM1 in CPU partition mode would be impacted by this patch. Tracked-On: #4232 Signed-off-by: Victor Sun Acked-by: Eddie Dong --- Makefile | 3 +++ hypervisor/arch/x86/Kconfig | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 76355bccb..0eab2e643 100644 --- a/Makefile +++ b/Makefile @@ -117,6 +117,9 @@ hypervisor: else \ $(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) defconfig; \ echo "CONFIG_$(shell echo $(SCENARIO) | tr a-z A-Z)=y" >> $(HV_OUT)/.config; \ + if [ "$(SCENARIO)" != "sdc" ]; then \ + echo "CONFIG_MAX_KATA_VM_NUM=0" >> $(HV_OUT)/.config; \ + fi; \ if [ "$(CONFIG_XML_ENABLED)" = "true" ]; then \ echo "CONFIG_ENFORCE_VALIDATED_ACPI_INFO=y" >> $(HV_OUT)/.config; \ fi; \ diff --git a/hypervisor/arch/x86/Kconfig b/hypervisor/arch/x86/Kconfig index b1011d28d..1ebd12900 100644 --- a/hypervisor/arch/x86/Kconfig +++ b/hypervisor/arch/x86/Kconfig @@ -308,7 +308,8 @@ config L1D_FLUSH_VMENTRY_ENABLED config MAX_KATA_VM_NUM int "Maximum number of Kata Containers in SOS" range 0 1 - default 0 + default 1 if SDC + default 0 if !SDC config UEFI_OS_LOADER_NAME string "UEFI OS loader name"