Skip to content

Commit e1076e7

Browse files
DakshinDroypat
authored andcommitted
Remove unwrap and propagate errors in PIO device manager setup
Replace unwraps with map_err to propagate LegacyDeviceError as VmmError::LegacyIOBus. This completes a TODO and prevents potential panics. Signed-off-by: Dakshin Devanand <[email protected]>
1 parent a6d0d93 commit e1076e7

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/vmm/src/builder.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,11 @@ fn create_vmm_and_vcpus(
164164
let reset_evt = vcpus_exit_evt.try_clone().map_err(VmmError::EventFd)?;
165165

166166
// create pio dev manager with legacy devices
167-
// TODO Remove these unwraps.
168-
let mut pio_dev_mgr = PortIODeviceManager::new(serial_device, reset_evt).unwrap();
169-
pio_dev_mgr.register_devices(vm.fd()).unwrap();
167+
let mut pio_dev_mgr =
168+
PortIODeviceManager::new(serial_device, reset_evt).map_err(VmmError::LegacyIOBus)?;
169+
pio_dev_mgr
170+
.register_devices(vm.fd())
171+
.map_err(VmmError::LegacyIOBus)?;
170172
pio_dev_mgr
171173
};
172174

0 commit comments

Comments
 (0)