Skip to content
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

SoftNpu early return on empty guest virtio buffers, bump dlpi crate, fix duplicate crate import issue #274

Merged
merged 2 commits into from
Dec 14, 2022
Merged

SoftNpu early return on empty guest virtio buffers, bump dlpi crate, fix duplicate crate import issue #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8a5e19
virtio early break, bump dlpi, no pub header-check
rcgoodfellow Dec 14, 2022
d46b094
feed clippy
rcgoodfellow Dec 14, 2022
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
7 changes: 3 additions & 4 deletions bin/propolis-standalone/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,9 @@ impl Instance {
match state {
State::Run => {
if first_boot {
ent.start().expect(&format!(
"entity {} failed to start",
record.name()
));
ent.start().unwrap_or_else(|_| {
panic!("entity {} failed to start", record.name())
});
} else {
ent.resume();
}
Expand Down
1 change: 1 addition & 0 deletions crates/bhyve-api/header-check/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version = "0.0.0"
authors = ["Patrick Mooney <[email protected]>"]
license = "MPL-2.0"
build = "build.rs"
publish = false
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh nice. I didn't know about that


[dependencies]
bhyve_api = { path = ".." }
Expand Down
1 change: 1 addition & 0 deletions crates/viona-api/header-check/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version = "0.0.0"
authors = ["Patrick Mooney <[email protected]>"]
license = "MPL-2.0"
build = "build.rs"
publish = false

[dependencies]
viona_api = { path = ".." }
Expand Down
3 changes: 1 addition & 2 deletions lib/propolis/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,9 @@ branch = "main"
optional = true
package = "softnpu"

#see: https://github.com/oxidecomputer/dlpi-sys/issues/1
[dependencies.dlpi]
git = "https://github.com/oxidecomputer/dlpi-sys"
rev = "eb4dffeef88f86294d939aeb5521509ea3d59b69"
branch = "main"
optional = true

[dev-dependencies]
Expand Down
2 changes: 2 additions & 0 deletions lib/propolis/src/hw/virtio/softnpu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,8 @@ impl PciVirtioSoftNpuPort {
if n != 10 {
if n > 0 {
push_used = true;
} else {
break;
}
warn!(self.log, "failed to read virtio mystery bytes ({})", n);
//break;
Expand Down