Skip to content

fix nits on non-x86 #1150

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
ahrens merged 1 commit into from
Jun 4, 2026
+5 −3
Merged

fix nits on non-x86 #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 crates/cpuid-utils/src/host.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pub fn query(leaf: CpuidIdent) -> CpuidValues {
}

#[cfg(not(target_arch = "x86_64"))]
pub fn query(leaf: CpuidIdent) -> CpuidValues {
pub fn query(_leaf: CpuidIdent) -> CpuidValues {
panic!("host CPUID queries only work on x86-64 hosts")
}

Expand Down
6 changes: 4 additions & 2 deletions lib/propolis/src/vcpu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use migrate::VcpuReadWrite;
use thiserror::Error;

use bhyve_api::ApiVersion;
use propolis_types::{CpuidIdent, CpuidValues, CpuidVendor};
use propolis_types::{CpuidIdent, CpuidVendor};

#[usdt::provider(provider = "propolis")]
mod probes {
Expand Down Expand Up @@ -77,7 +77,9 @@ impl Vcpu {
#[cfg(target_arch = "x86_64")]
fn query_hardware_vendor() -> CpuidVendor {
let res = unsafe { core::arch::x86_64::__cpuid(0) };
CpuidValues::from(res).try_into().expect("CPU vendor is recognized")
propolis_types::CpuidValues::from(res)
.try_into()
.expect("CPU vendor is recognized")
}

#[cfg(not(target_arch = "x86_64"))]
Expand Down
Loading