mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-28 21:03:54 -06:00
rust: pl011: convert pl011_create to safe Rust
Not a major change but, as a small but significant step in creating qdev bindings, show how pl011_create can be written without "unsafe" calls (apart from converting pointers to references). This also provides a starting point for creating Error** bindings. Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
a22bd55ffd
commit
7630ca2a70
2 changed files with 49 additions and 22 deletions
|
@ -2,18 +2,18 @@
|
|||
// Author(s): Paolo Bonzini <pbonzini@redhat.com>
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
use std::ffi::CStr;
|
||||
use std::{ffi::CStr, ptr::addr_of_mut};
|
||||
|
||||
pub use bindings::{SysBusDevice, SysBusDeviceClass};
|
||||
|
||||
use crate::{
|
||||
bindings,
|
||||
cell::bql_locked,
|
||||
irq::InterruptSource,
|
||||
irq::{IRQState, InterruptSource},
|
||||
memory::MemoryRegion,
|
||||
prelude::*,
|
||||
qdev::{DeviceClass, DeviceState},
|
||||
qom::ClassInitImpl,
|
||||
qom::{ClassInitImpl, Owned},
|
||||
};
|
||||
|
||||
unsafe impl ObjectType for SysBusDevice {
|
||||
|
@ -60,6 +60,34 @@ where
|
|||
bindings::sysbus_init_irq(self.as_mut_ptr(), irq.as_ptr());
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: do we want a type like GuestAddress here?
|
||||
fn mmio_map(&self, id: u32, addr: u64) {
|
||||
assert!(bql_locked());
|
||||
let id: i32 = id.try_into().unwrap();
|
||||
unsafe {
|
||||
bindings::sysbus_mmio_map(self.as_mut_ptr(), id, addr);
|
||||
}
|
||||
}
|
||||
|
||||
// Owned<> is used here because sysbus_connect_irq (via
|
||||
// object_property_set_link) adds a reference to the IRQState,
|
||||
// which can prolong its life
|
||||
fn connect_irq(&self, id: u32, irq: &Owned<IRQState>) {
|
||||
assert!(bql_locked());
|
||||
let id: i32 = id.try_into().unwrap();
|
||||
unsafe {
|
||||
bindings::sysbus_connect_irq(self.as_mut_ptr(), id, irq.as_mut_ptr());
|
||||
}
|
||||
}
|
||||
|
||||
fn sysbus_realize(&self) {
|
||||
// TODO: return an Error
|
||||
assert!(bql_locked());
|
||||
unsafe {
|
||||
bindings::sysbus_realize(self.as_mut_ptr(), addr_of_mut!(bindings::error_fatal));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<R: ObjectDeref> SysBusDeviceMethods for R where R::Target: IsA<SysBusDevice> {}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue