mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2026-08-05 02:19:16 +00:00
vmm: Deprecate mergeable option from virtio-pmem
KSM would never merge the file backed pages so this option has no effect. See: #3968 Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
@@ -2681,14 +2681,7 @@ impl DeviceManager {
|
||||
.memory_manager
|
||||
.lock()
|
||||
.unwrap()
|
||||
.create_userspace_mapping(
|
||||
region_base,
|
||||
region_size,
|
||||
host_addr,
|
||||
pmem_cfg.mergeable,
|
||||
false,
|
||||
false,
|
||||
)
|
||||
.create_userspace_mapping(region_base, region_size, host_addr, false, false, false)
|
||||
.map_err(DeviceManagerError::MemoryManager)?;
|
||||
|
||||
let mapping = virtio_devices::UserspaceMapping {
|
||||
@@ -2696,7 +2689,7 @@ impl DeviceManager {
|
||||
mem_slot,
|
||||
addr: GuestAddress(region_base),
|
||||
len: region_size,
|
||||
mergeable: pmem_cfg.mergeable,
|
||||
mergeable: false,
|
||||
};
|
||||
|
||||
let virtio_pmem_device = Arc::new(Mutex::new(
|
||||
|
||||
Reference in New Issue
Block a user