Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion bin/propolis-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ async fn migrate_instance(
.collect::<Result<Vec<_>, _>>()?
// Then any errors from polling the source/destination
.into_iter()
.collect::<anyhow::Result<_>>()?;
.collect::<anyhow::Result<()>>()?;

Ok(())
}
Expand Down
4 changes: 4 additions & 0 deletions lib/propolis/src/firmware/smbios/bits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,11 @@ pub(crate) struct Type1 {
}
raw_table_impl!(Type1, 1);

// We don't create type 2 tables yet, but it's nice to have the definition on hand.
/// Type 2 (Baseboard Information)
#[derive(Copy, Clone)]
#[repr(C, packed)]
#[allow(dead_code)]
pub(crate) struct Type2 {
pub header: StructureHeader,
pub manufacturer: u8,
Expand All @@ -159,9 +161,11 @@ pub(crate) struct Type2 {
}
raw_table_impl!(Type2, 2);

// We don't create type 2 tables yet, but it's nice to have the definition on hand.
/// Type 3 (System Enclosure) - Version 2.7
#[derive(Copy, Clone)]
#[repr(C, packed)]
#[allow(dead_code)]
pub(crate) struct Type3 {
pub header: StructureHeader,
pub manufacturer: u8,
Expand Down
Loading