Fix potential dealock for register_serial_device and register_vsock_device #221
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gaojiaqi7
reviewed
Apr 30, 2024
src/devices/virtio_serial/src/lib.rs
Outdated
| SERIAL_DEVICE.lock().get_mut().unwrap().init()?; | ||
| let mut serial_device = SERIAL_DEVICE.lock(); | ||
| serial_device.call_once(|| dev); | ||
| match serial_device.get_mut() { |
There was a problem hiding this comment.
Please simplify this with .ok_or(VirtioSerialError::Initialization)?.init()?
liuw1
force-pushed
the
fix-220
branch
2 times, most recently
from
76849b1 to
1cf6389
Compare
…evice Fix intel#218 and Fix intel#220 Signed-off-by: Wei Liu <[email protected]>
gaojiaqi7
approved these changes
Apr 30, 2024
src/devices/vsock/src/lib.rs
Outdated
| @@ -24,6 +24,8 @@ const VSOCK_BUF_ALLOC: u32 = 0x40000; | |||
|
|
|||
| #[derive(Debug)] | |||
| pub enum VsockError { | |||
| /// Initialization error | |||
| InitializationError, | |||
There was a problem hiding this comment.
Please rename to Initialization
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #218 and Fix #220