From ba68012480e8308998d2165d6d647498f0989aac Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Mon, 27 Jan 2020 20:27:48 +0000 Subject: [PATCH] kernel: use the maximum number of CPUs supported by KVM Since we don't know how many CPUs can have the host, we should use the maximum number of CPUs supported by KVM (240). 255 is the maximum number of CPUs supported in the kernel, but the maximmum number of CPUs recommended by KVM is 240, if more than 240 CPUs are used, next error will be returned by QEMU ``` Number of hotpluggable cpus requested (255) exceeds the recommended cpus supported by KVM (240) ``` fixes #922 fixes kata-containers/runtime#2413 Signed-off-by: Julio Montes --- kernel/configs/fragments/x86_64/base.conf | 3 +++ kernel/kata_config_version | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/configs/fragments/x86_64/base.conf b/kernel/configs/fragments/x86_64/base.conf index 33e612258..c59807477 100644 --- a/kernel/configs/fragments/x86_64/base.conf +++ b/kernel/configs/fragments/x86_64/base.conf @@ -3,3 +3,6 @@ CONFIG_X86_CPUID=y CONFIG_X86_MSR=y CONFIG_X86_X2APIC=y CONFIG_X86_VERBOSE_BOOTUP=y + +# Use the maximum number of CPUs supported by KVM (240) +CONFIG_NR_CPUS=240 diff --git a/kernel/kata_config_version b/kernel/kata_config_version index 4b9026d8e..900731ffd 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -63 +64