motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-23 01:51:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

rust: prefer NonNull::new to assertions

Browse source 
Do not use new_unchecked; the effect is the same, but the
code is easier to read and unsafe regions become smaller.
Likewise, NonNull::new can be used instead of assertion and
followed by as_ref() or as_mut() instead of dereferencing the
pointer.

Suggested-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2025-01-23 11:25:22 +01:00
parent 24f0e8d818
commit 7d0520398f
5 changed files with 35 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

23
rust/hw/char/pl011/src/device_class.rs
View file

@ -12,12 +12,10 @@ use qemu_api::{
use crate::device::PL011State;
#[allow(clippy::missing_const_for_fn)]
extern "C" fn pl011_clock_needed(opaque: *mut c_void) -> bool {
unsafe {
debug_assert!(!opaque.is_null());
let state = NonNull::new_unchecked(opaque.cast::<PL011State>());
state.as_ref().migrate_clock
}
let state = NonNull::new(opaque).unwrap().cast::<PL011State>();
unsafe { state.as_ref().migrate_clock }
}
/// Migration subsection for [`PL011State`] clock.
@ -33,15 +31,12 @@ pub static VMSTATE_PL011_CLOCK: VMStateDescription = VMStateDescription {
};
extern "C" fn pl011_post_load(opaque: *mut c_void, version_id: c_int) -> c_int {
unsafe {
debug_assert!(!opaque.is_null());
let mut state = NonNull::new_unchecked(opaque.cast::<PL011State>());
let result = state.as_mut().post_load(version_id as u32);
if result.is_err() {
-1
} else {
0
}
let mut state = NonNull::new(opaque).unwrap().cast::<PL011State>();
let result = unsafe { state.as_mut().post_load(version_id as u32) };
if result.is_err() {
-1
} else {
0
}
}