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:
Rob Bradford
2022-04-12 10:19:58 +01:00
committed by Bo Chen
parent 6bf6d95c55
commit b212f2823d
2 changed files with 7 additions and 10 deletions

View File

@@ -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(