izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

rust/util: add ensure macro

Browse Source 
The macro is similar to anyhow::ensure but uses QEMU's variation
on anyhow::Error.  It can be used to easily check a condition
and format an error message.

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini
2025-11-04 17:13:00 +01:00
parent 71260a0120
commit 56dbf087a8
3 changed files with 86 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rust/hw/timer/hpet/src/device.rs
+12 -9
View File
@@ -25,7 +25,10 @@ use system::{
bindings::{address_space_memory, address_space_stl_le, hwaddr},
MemoryRegion, MemoryRegionOps, MemoryRegionOpsBuilder, MEMTXATTRS_UNSPECIFIED,
};
use util::timer::{Timer, CLOCK_VIRTUAL, NANOSECONDS_PER_SECOND};
use util::{
ensure,
timer::{Timer, CLOCK_VIRTUAL, NANOSECONDS_PER_SECOND},
};
use crate::fw_cfg::HPETFwConfig;
@@ -728,14 +731,14 @@ impl HPETState {
}
fn realize(&self) -> util::Result<()> {
if self.num_timers < HPET_MIN_TIMERS || self.num_timers > HPET_MAX_TIMERS {
Err(format!(
"hpet.num_timers must be between {HPET_MIN_TIMERS} and {HPET_MAX_TIMERS}"
))?;
}
if self.int_route_cap == 0 {
Err("hpet.hpet-intcap property not initialized")?;
}
ensure!(
(HPET_MIN_TIMERS..=HPET_MAX_TIMERS).contains(&self.num_timers),
"hpet.num_timers must be between {HPET_MIN_TIMERS} and {HPET_MAX_TIMERS}"
);
ensure!(
self.int_route_cap != 0,
"hpet.hpet-intcap property not initialized"
);
self.hpet_id.set(HPETFwConfig::assign_hpet_id()?);
rust/hw/timer/hpet/src/fw_cfg.rs
+3 -4
View File
@@ -5,6 +5,7 @@
use std::ptr::addr_of_mut;
use common::Zeroable;
use util::{self, ensure};
/// Each `HPETState` represents a Event Timer Block. The v1 spec supports
/// up to 8 blocks. QEMU only uses 1 block (in PC machine).
@@ -36,7 +37,7 @@ pub static mut hpet_fw_cfg: HPETFwConfig = HPETFwConfig {
};
impl HPETFwConfig {
pub(crate) fn assign_hpet_id() -> Result<usize, &'static str> {
pub(crate) fn assign_hpet_id() -> util::Result<usize> {
assert!(bql::is_locked());
// SAFETY: all accesses go through these methods, which guarantee
// that the accesses are protected by the BQL.
@@ -47,9 +48,7 @@ impl HPETFwConfig {
fw_cfg.count = 0;
}
if fw_cfg.count == 8 {
Err("Only 8 instances of HPET are allowed")?;
}
ensure!(fw_cfg.count != 8, "Only 8 instances of HPET are allowed");
let id: usize = fw_cfg.count.into();
fw_cfg.count += 1;