Skip to content

Remove unwrap in PIO device manager setup TODO #5138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 9, 2025
Merged

Remove unwrap in PIO device manager setup TODO #5138

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3697fb
Remove unwrap and propagate errors in PIO device manager setup
DakshinD Apr 3, 2025
b65d463
Merge branch 'main' into legacy-unwrap
roypat Apr 7, 2025
bf3b182
Merge branch 'main' into legacy-unwrap
ShadowCurse Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/vmm/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,11 @@ fn create_vmm_and_vcpus(
let reset_evt = vcpus_exit_evt.try_clone().map_err(VmmError::EventFd)?;

// create pio dev manager with legacy devices
// TODO Remove these unwraps.
let mut pio_dev_mgr = PortIODeviceManager::new(serial_device, reset_evt).unwrap();
pio_dev_mgr.register_devices(vm.fd()).unwrap();
let mut pio_dev_mgr =
PortIODeviceManager::new(serial_device, reset_evt).map_err(VmmError::LegacyIOBus)?;
pio_dev_mgr
.register_devices(vm.fd())
.map_err(VmmError::LegacyIOBus)?;
pio_dev_mgr
};

Expand Down