From f0e618431d83906033eab9bb60ff849c52d5116a Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Tue, 19 Nov 2019 17:15:29 +0100 Subject: [PATCH] vmm: device_manager: Use consistent naming when adding devices When adding devices to the guest, and populating the device model, we should prefix the routines with add_. When we're just creating the device objects but not yet adding them we use make_. Signed-off-by: Samuel Ortiz --- vmm/src/device_manager.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs index 458cf60f6..9145dec0c 100644 --- a/vmm/src/device_manager.rs +++ b/vmm/src/device_manager.rs @@ -430,13 +430,13 @@ impl DeviceManager { vm_fd: vm_info.vm_fd.clone(), }); - let ioapic = DeviceManager::make_ioapic(vm_info, &address_manager, userspace_ioapic)?; + let ioapic = DeviceManager::add_ioapic(vm_info, &address_manager, userspace_ioapic)?; let interrupt_info = InterruptInfo { _msi_capable, ioapic: &ioapic, }; - let console = DeviceManager::make_console_device( + let console = DeviceManager::add_console_device( vm_info, &address_manager, &ioapic, @@ -629,7 +629,7 @@ impl DeviceManager { Ok(()) } - fn make_ioapic( + fn add_ioapic( vm_info: &VmInfo, address_manager: &Arc, userspace_ioapic: bool, @@ -708,7 +708,7 @@ impl DeviceManager { Ok(()) } - fn make_console_device( + fn add_console_device( vm_info: &VmInfo, address_manager: &Arc, ioapic: &Option>>,