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

rust: qom: make INSTANCE_POST_INIT take a shared reference

Browse source 
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-11-29 08:48:07 +01:00
parent af68b41d40
commit 22a18f0a98
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rust/hw/char/pl011/src/device.rs
View file

@ -145,7 +145,7 @@ impl ObjectImpl for PL011State {
type ParentType = SysBusDevice; type ParentType = SysBusDevice;
const INSTANCE_INIT: Option<unsafe fn(&mut Self)> = Some(Self::init); const INSTANCE_INIT: Option<unsafe fn(&mut Self)> = Some(Self::init);
const INSTANCE_POST_INIT: Option<fn(&mut Self)> = Some(Self::post_init); const INSTANCE_POST_INIT: Option<fn(&Self)> = Some(Self::post_init);
} }
impl DeviceImpl for PL011State { impl DeviceImpl for PL011State {
@ -206,7 +206,7 @@ impl PL011State {
} }
} }
fn post_init(&mut self) { fn post_init(&self) {
let sbd: &SysBusDevice = self.upcast(); let sbd: &SysBusDevice = self.upcast();
sbd.init_mmio(&self.iomem); sbd.init_mmio(&self.iomem);

8
rust/qemu-api/src/qom.rs
View file

@ -163,11 +163,7 @@ unsafe extern "C" fn rust_instance_post_init<T: ObjectImpl>(obj: *mut Object) {
// SAFETY: obj is an instance of T, since rust_instance_post_init<T> // SAFETY: obj is an instance of T, since rust_instance_post_init<T>
// is called from QOM core as the instance_post_init function // is called from QOM core as the instance_post_init function
// for class T // for class T
// T::INSTANCE_POST_INIT.unwrap()(unsafe { &*obj.cast::<T>() })
// FIXME: it's not really guaranteed that there are no backpointers to
// obj; it's quite possible that they have been created by instance_init().
// The receiver should be &self, not &mut self.
T::INSTANCE_POST_INIT.unwrap()(unsafe { &mut *obj.cast::<T>() })
} }
unsafe extern "C" fn rust_class_init<T: ObjectType + ClassInitImpl<T::Class>>( unsafe extern "C" fn rust_class_init<T: ObjectType + ClassInitImpl<T::Class>>(
@ -463,7 +459,7 @@ pub trait ObjectImpl: ObjectType + ClassInitImpl<Self::Class> {
/// Function that is called to finish initialization of an object, once /// Function that is called to finish initialization of an object, once
/// `INSTANCE_INIT` functions have been called. /// `INSTANCE_INIT` functions have been called.
const INSTANCE_POST_INIT: Option<fn(&mut Self)> = None; const INSTANCE_POST_INIT: Option<fn(&Self)> = None;
/// Called on descendent classes after all parent class initialization /// Called on descendent classes after all parent class initialization
/// has occurred, but before the class itself is initialized. This /// has occurred, but before the class itself is initialized. This