kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: memory_manager: Support non-power-of-2 block sizes

Browse Source 
Replace alignment calculation of start address with functionally
equivalent version that does not assume that the block size is a power
of two.

Signed-off-by: Martin Xu <martin.xu@intel.com>
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Martin Xu
2020-03-31 11:53:14 -07:00
committed by Sebastien Boeuf
parent f8ee89a514
commit 5a380a6918
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vmm/src/memory_manager.rs
View File

@@ -282,9 +282,11 @@ impl MemoryManager {
let mut virtiomem_resize = None; let mut virtiomem_resize = None;
if let Some(size) = config.hotplug_size { if let Some(size) = config.hotplug_size {
if config.hotplug_method == HotplugMethod::VirtioMem { if config.hotplug_method == HotplugMethod::VirtioMem {
// Alignment must be "natural" i.e. same as size of block
let start_addr = GuestAddress( let start_addr = GuestAddress(
(start_of_device_area.0 + vm_virtio::VIRTIO_MEM_DEFAULT_BLOCK_SIZE - 1) (start_of_device_area.0 + vm_virtio::VIRTIO_MEM_DEFAULT_BLOCK_SIZE - 1)
& (!(vm_virtio::VIRTIO_MEM_DEFAULT_BLOCK_SIZE - 1)), / vm_virtio::VIRTIO_MEM_DEFAULT_BLOCK_SIZE
* vm_virtio::VIRTIO_MEM_DEFAULT_BLOCK_SIZE,
); );
virtiomem_region = Some(MemoryManager::create_ram_region( virtiomem_region = Some(MemoryManager::create_ram_region(
&config.file, &config.file,