Merge pull request #8533 from fidencio/topic/fix-invalid-cpu-topology…

…-for-tdx Revert "runtime: confidential: Do not set the max_vcpu to cpu"
kata-containers · Nov 30, 2023 · 9b30d97 · 9b30d97
2 parents 1f1e537 + f15e16b
commit 9b30d97
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/runtime/virtcontainers/hypervisor_config_linux.go b/src/runtime/virtcontainers/hypervisor_config_linux.go
@@ -58,6 +58,11 @@ func validateHypervisorConfig(conf *HypervisorConfig) error {
 		conf.DefaultMaxVCPUs = defaultMaxVCPUs
 	}
 
+	if conf.ConfidentialGuest && conf.NumVCPUs() != conf.DefaultMaxVCPUs {
+		hvLogger.Warnf("Confidential guests do not support hotplugging of vCPUs. Setting DefaultMaxVCPUs to NumVCPUs (%d)", conf.NumVCPUs())
+		conf.DefaultMaxVCPUs = conf.NumVCPUs()
+	}
+
 	if conf.Msize9p == 0 && conf.SharedFS != config.VirtioFS {
 		conf.Msize9p = defaultMsize9p
 	}