github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-07-01 14:38:33 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: qemu: don't set maxcpus when confidential guest is enabled

Browse Source 
QEMU maxcpus enables CPU hotplug capabilities but it's unused when
confidential guest is enabled.

Change runtime-rs code to skip setting maxcpus QEMU cmdline if CPU hotplug
is not needed.

Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
This commit is contained in:
Mikko Ylinen
2026-02-18 13:36:26 +02:00
parent a2bb3f64b0
commit 2e625d0bab
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/runtime-rs/crates/hypervisor/src/qemu/cmdline_generator.rs
View File

@@ -336,9 +336,17 @@ struct Smp {
impl Smp {
fn new(config: &HypervisorConfig) -> Smp {
let num_vcpus = config.cpu_info.default_vcpus.ceil() as u32;
let max_num_vcpus = if config.security_info.confidential_guest {
// Disable CPU hotplug when confidential guest is enabled
num_vcpus
} else {
config.cpu_info.default_maxvcpus
};
Smp {
num_vcpus: config.cpu_info.default_vcpus.ceil() as u32,
max_num_vcpus: config.cpu_info.default_maxvcpus,
num_vcpus,
max_num_vcpus,
}
}
}
@@ -350,7 +358,11 @@ impl ToQemuParams for Smp {
// CpuInfo::adjust_config() seems to ensure that both vcpu numbers
// will have sanitised non-zero values
params.push(format!("{}", self.num_vcpus));
params.push(format!("maxcpus={}", self.max_num_vcpus));
// Only add maxcpus if it differs from num_vcpus (enables CPU hotplug)
if self.max_num_vcpus > self.num_vcpus {
params.push(format!("maxcpus={}", self.max_num_vcpus));
}
Ok(vec!["-smp".to_owned(), params.join(",")])
}