From d1504e5654aa51b2778eeeee4aa391ef9b13c4c8 Mon Sep 17 00:00:00 2001 From: Yu Li Date: Thu, 25 May 2023 19:43:30 +0800 Subject: [PATCH] vmm: use `unwrap_or` instead of `match` for `prefault` Signed-off-by: Yu Li --- vmm/src/memory_manager.rs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/vmm/src/memory_manager.rs b/vmm/src/memory_manager.rs index 400fcaad2..48d7626cf 100644 --- a/vmm/src/memory_manager.rs +++ b/vmm/src/memory_manager.rs @@ -494,10 +494,7 @@ impl MemoryManager { file_offset, region_start, region_size, - match prefault { - Some(pf) => pf, - None => zone.prefault, - }, + prefault.unwrap_or(zone.prefault), zone.shared, zone.hugepages, zone.hugepage_size, @@ -573,10 +570,7 @@ impl MemoryManager { guest_ram_mapping.file_offset, GuestAddress(guest_ram_mapping.gpa), guest_ram_mapping.size as usize, - match prefault { - Some(pf) => pf, - None => zone_config.prefault, - }, + prefault.unwrap_or(zone_config.prefault), zone_config.shared, zone_config.hugepages, zone_config.hugepage_size, @@ -997,10 +991,7 @@ impl MemoryManager { 0, start_addr, hotplug_size as usize, - match prefault { - Some(pf) => pf, - None => zone.prefault, - }, + prefault.unwrap_or(zone.prefault), zone.shared, zone.hugepages, zone.hugepage_size,