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

rust: qom: put class_init together from multiple ClassInitImpl<>

Browse source 
Parameterize the implementation of ClassInitImpl so that it is
possible to call up the chain of implementations, one superclass at
a time starting at ClassInitImpl<Self::Class>.

In order to avoid having to implement (for example)
ClassInitImpl<PL011Class>, also remove the dummy PL011Class and
PL011LuminaryClass structs and specify the same ObjectType::Class as
the superclass.  In the future this default behavior can be handled by
a procedural macro, by looking at the first field in the struct.

Note that the new trait is safe: the calls are started by
rust_class_init<>(), which is not public and can convert the class
pointer to a Rust reference.

Since CLASS_BASE_INIT applies to the type that is being defined,
and only to it, move it to ObjectImpl.

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 15:19:23 +01:00
parent b1987a2547
commit 6dd818fbbb
5 changed files with 127 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rust/qemu-api/tests/tests.rs
View file

@ -26,11 +26,6 @@ fn test_device_decl_macros() {
pub migrate_clock: bool,
}
#[repr(C)]
pub struct DummyClass {
pub _parent: DeviceClass,
}
declare_properties! {
DUMMY_PROPERTIES,
define_property!(
@ -43,7 +38,7 @@ fn test_device_decl_macros() {
}
unsafe impl ObjectType for DummyState {
type Class = DummyClass;
type Class = <DeviceState as ObjectType>::Class;
const TYPE_NAME: &'static CStr = c_str!("dummy");
}
@ -61,8 +56,6 @@ fn test_device_decl_macros() {
}
}
impl_device_class!(DummyState);
unsafe {
module_call_init(module_init_type::MODULE_INIT_QOM);
object_unref(object_new(DummyState::TYPE_NAME.as_ptr()).cast());