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

rust: pl011: only leave embedded object initialization in instance_init

Browse source 
Leave IRQ and MMIO initialization to instance_post_init.  In Rust the
two callbacks are more distinct, because only instance_post_init has a
fully initialized object available.

While at it, add a wrapper for sysbus_init_mmio so that accesses to
the SysBusDevice correctly use shared references.

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-12-02 13:16:19 +01:00
parent d9434f29ca
commit af68b41d40
2 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -145,6 +145,7 @@ impl ObjectImpl for PL011State {
type ParentType = SysBusDevice;
const INSTANCE_INIT: Option<unsafe fn(&mut Self)> = Some(Self::init);
const INSTANCE_POST_INIT: Option<fn(&mut Self)> = Some(Self::post_init);
}
impl DeviceImpl for PL011State {
@ -183,14 +184,6 @@ impl PL011State {
Self::TYPE_NAME.as_ptr(),
0x1000,
);
let sbd: &mut SysBusDevice = self.upcast_mut();
sysbus_init_mmio(sbd, addr_of_mut!(self.iomem));
}
for irq in self.interrupts.iter() {
let sbd: &SysBusDevice = self.upcast();
sbd.init_irq(irq);
}
// SAFETY:
@ -213,6 +206,15 @@ impl PL011State {
}
}
fn post_init(&mut self) {
let sbd: &SysBusDevice = self.upcast();
sbd.init_mmio(&self.iomem);
for irq in self.interrupts.iter() {
sbd.init_irq(irq);
}
}
pub fn read(&mut self, offset: hwaddr, _size: c_uint) -> std::ops::ControlFlow<u64, u64> {
use RegisterOffset::*;