Rework PCI emulation to better expose inner data #57
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
The previous structure for PCI device emulation made it inconvenient to access the inner data of devices for initialization during setup. This attempts to flatten some of the data model at the cost of more monoporphization.
luqmana
reviewed
Oct 15, 2021
Comment on lines
+471
to
+478
| struct IsrInner { | ||
| disabled: bool, | ||
| value: u8, | ||
| pin: Option<Arc<dyn IntrPin>>, | ||
| } | ||
| struct IsrState { | ||
| inner: Mutex<IsrInner>, | ||
| } |
There was a problem hiding this comment.
This seems like a useful abstraction we could use for other device code
There was a problem hiding this comment.
I'll work on something a more generic for this stuff. (separately)
luqmana
reviewed
Oct 15, 2021
luqmana
reviewed
Oct 15, 2021
Comment on lines
+110
to
118
| let bnum = BusNum::new(bus); | ||
| let dnum = DevNum::new(dev); | ||
| let fnum = FuncNum::new(func); | ||
| match (bnum, dnum, fnum) { | ||
| (Some(b), Some(d), Some(f)) => { | ||
| Some(Self { bus: b, dev: d, func: f }) | ||
| } | ||
| _ => None, | ||
| } |
There was a problem hiding this comment.
Suggested change
| let bnum = BusNum::new(bus); | |
| let dnum = DevNum::new(dev); | |
| let fnum = FuncNum::new(func); | |
| match (bnum, dnum, fnum) { | |
| (Some(b), Some(d), Some(f)) => { | |
| Some(Self { bus: b, dev: d, func: f }) | |
| } | |
| _ => None, | |
| } | |
| let bus = BusNum::new(bus)?; | |
| let dev = DevNum::new(dev)?; | |
| let func = FuncNum::new(func)?; | |
| Some(Self { bus, dev, func }) |
? also works for Option
There was a problem hiding this comment.
That's probably how I wrote it the first time. Unfortunately:
error[E0658]:
?is not allowed in aconst fn
note: see issue #74935 rust-lang/rust#74935 for more information
I'll add a comment mentioning it, though.
luqmana
reviewed
Oct 15, 2021
propolis/src/hw/pci/bus.rs
Outdated
| let res = self.slots[bdf.dev.get() as usize].funcs | ||
| [bdf.func.get() as usize] | ||
| .as_ref() | ||
| .map(|d| Arc::clone(d)); |
There was a problem hiding this comment.
Small suggestion: you can eschew the extra lambda here by just passing Arc:clone directly: .map(Arc::clone)
luqmana
approved these changes
Oct 15, 2021
|
Merged in c3558de |
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.
The previous structure for PCI device emulation made it inconvenient to
access the inner data of devices for initialization during setup. This
attempts to flatten some of the data model at the cost of more
monoporphization.