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

Merge pull request #13228 from fidencio/topic/dont-set-slots-maxmem-for-confidential-guests

Browse Source 
runtime-rs: qemu: don't set slots/maxmem for confidential guests
This commit is contained in:
Fabiano Fidêncio
2026-06-24 17:27:28 +02:00
committed by GitHub
parent 13b3020c34 1aff0ebcad
commit 6528e7a72f
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,13 +263,24 @@ struct Memory {
impl Memory {
fn new(config: &HypervisorConfig) -> Memory {
let mem_size = config.memory_info.default_memory as u64;
let max_mem_size = config.memory_info.default_maxmemory as u64;
// Don't reserve a memory-hotplug region (slots/maxmem) for confidential
// guests, which don't support memory hotplug, mirroring how Smp::new
// omits maxcpus and what the Go runtime does in memoryTopology().
let (num_slots, max_mem_size) = if config.security_info.confidential_guest {
(0, 0)
} else {
(
config.memory_info.memory_slots,
config.memory_info.default_maxmemory as u64,
)
};
// Memory sizes are given in megabytes in configuration.toml so we
// need to convert them to bytes for storage.
Memory {
size: mem_size * MI_B,
num_slots: config.memory_info.memory_slots,
num_slots,
max_size: max_mem_size * MI_B,
memory_backend_file: None,
}