Kconfig: remove MAX_KATA_VM_NUM

CONFIG_MAX_KATA_VM_NUM is a scenario specific configuration, so it is better
to put the MACRO in scenario folder directly, to instead the Kconfig item in
Kconfig file which should work for all scenarios;

Tracked-On: #4616

Signed-off-by: Victor Sun <victor.sun@intel.com>

Author: jsun26intel

Makefile

@@ -160,11 +160,6 @@ hypervisor:
 	fi
 	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) clean;
 	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(abspath $(TARGET_DIR)) defconfig;
-	@if [ "$(CONFIG_XML_ENABLED)" != "true" ] && [ ! -f $(KCONFIG_FILE) ]; then \
-		if [ "$(SCENARIO)" != "sdc" ]; then \
-			echo "CONFIG_MAX_KATA_VM_NUM=0" >> $(HV_OUT)/.config; \
-		fi; \
-	fi; \
 	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(abspath $(TARGET_DIR)) oldconfig;
 	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) TARGET_DIR=$(abspath $(TARGET_DIR))
 #ifeq ($(FIRMWARE),uefi)

hypervisor/arch/x86/Kconfig

@@ -313,12 +313,6 @@ config L1D_FLUSH_VMENTRY_ENABLED
 	bool "Enable L1 cache flush before VM entry"
 	default n
 
-config MAX_KATA_VM_NUM
-	int "Maximum number of Kata Containers in SOS"
-	range 0 1
-	default 1 if SDC
-	default 0 if !SDC
-
 config UEFI_OS_LOADER_NAME
 	string "UEFI OS loader name"
 	default "\\EFI\\org.clearlinux\\bootloaderx64.efi"

hypervisor/scenarios/hybrid/vm_configurations.h

@@ -20,6 +20,7 @@
 #define PRE_VM_NUM			1U
 #define SOS_VM_NUM			1U
 #define MAX_POST_VM_NUM			1U
+#define CONFIG_MAX_KATA_VM_NUM		0U
 
 #define VM0_CONFIG_VCPU_AFFINITY	{AFFINITY_CPU(3U)}
 #define VM0_CONFIG_MEM_START_HPA	0x100000000UL

hypervisor/scenarios/industry/vm_configurations.h

@@ -16,6 +16,7 @@
 #define PRE_VM_NUM			0U
 #define SOS_VM_NUM			1U
 #define MAX_POST_VM_NUM			2U
+#define CONFIG_MAX_KATA_VM_NUM		0U
 
 /* Bits mask of guest flags that can be programmed by device model. Other bits are set by hypervisor only */
 #define DM_OWNED_GUEST_FLAG_MASK	(GUEST_FLAG_SECURE_WORLD_ENABLED | GUEST_FLAG_LAPIC_PASSTHROUGH | \

hypervisor/scenarios/logical_partition/vm_configurations.h

@@ -20,6 +20,7 @@
 #define PRE_VM_NUM			2U
 #define SOS_VM_NUM			0U
 #define MAX_POST_VM_NUM			0U
+#define CONFIG_MAX_KATA_VM_NUM		0U
 
 /* The VM CONFIGs like:
  *	VMX_CONFIG_VCPU_AFFINITY

hypervisor/scenarios/sdc/vm_configurations.h

@@ -16,6 +16,7 @@
 #define PRE_VM_NUM			0U
 #define SOS_VM_NUM			1U
 #define MAX_POST_VM_NUM			2U	/* including 1 KATA VM */
+#define CONFIG_MAX_KATA_VM_NUM		1U
 
 /* Bits mask of guest flags that can be programmed by device model. Other bits are set by hypervisor only */
 #define DM_OWNED_GUEST_FLAG_MASK	(GUEST_FLAG_SECURE_WORLD_ENABLED | GUEST_FLAG_LAPIC_PASSTHROUGH | \

hypervisor/scenarios/sdc2/vm_configurations.h

@@ -16,6 +16,7 @@
 #define PRE_VM_NUM			0U
 #define SOS_VM_NUM			1U
 #define MAX_POST_VM_NUM			3U
+#define CONFIG_MAX_KATA_VM_NUM		0U
 
 /* Bits mask of guest flags that can be programmed by device model. Other bits are set by hypervisor only */
 #define DM_OWNED_GUEST_FLAG_MASK	(GUEST_FLAG_SECURE_WORLD_ENABLED | GUEST_FLAG_LAPIC_PASSTHROUGH | \