[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/8] rust: qom: add default definitions for ObjectImpl
From: |
Paolo Bonzini |
Subject: |
[PATCH 1/8] rust: qom: add default definitions for ObjectImpl |
Date: |
Mon, 25 Nov 2024 09:05:00 +0100 |
Remove a bunch of duplicate const definitions.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
rust/hw/char/pl011/src/device.rs | 6 ------
rust/qemu-api/src/definitions.rs | 8 ++++----
rust/qemu-api/tests/tests.rs | 4 ----
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/rust/hw/char/pl011/src/device.rs b/rust/hw/char/pl011/src/device.rs
index 7e57634bba0..f47e0f48d8a 100644
--- a/rust/hw/char/pl011/src/device.rs
+++ b/rust/hw/char/pl011/src/device.rs
@@ -109,10 +109,7 @@ impl ObjectImpl for PL011State {
const TYPE_INFO: qemu_api::bindings::TypeInfo = qemu_api::type_info! {
Self };
const TYPE_NAME: &'static CStr = crate::TYPE_PL011;
const PARENT_TYPE_NAME: Option<&'static CStr> = Some(TYPE_SYS_BUS_DEVICE);
- const ABSTRACT: bool = false;
const INSTANCE_INIT: Option<unsafe extern "C" fn(obj: *mut Object)> =
Some(pl011_init);
- const INSTANCE_POST_INIT: Option<unsafe extern "C" fn(obj: *mut Object)> =
None;
- const INSTANCE_FINALIZE: Option<unsafe extern "C" fn(obj: *mut Object)> =
None;
}
#[repr(C)]
@@ -666,8 +663,5 @@ impl ObjectImpl for PL011Luminary {
const TYPE_INFO: qemu_api::bindings::TypeInfo = qemu_api::type_info! {
Self };
const TYPE_NAME: &'static CStr = crate::TYPE_PL011_LUMINARY;
const PARENT_TYPE_NAME: Option<&'static CStr> = Some(crate::TYPE_PL011);
- const ABSTRACT: bool = false;
const INSTANCE_INIT: Option<unsafe extern "C" fn(obj: *mut Object)> =
Some(pl011_luminary_init);
- const INSTANCE_POST_INIT: Option<unsafe extern "C" fn(obj: *mut Object)> =
None;
- const INSTANCE_FINALIZE: Option<unsafe extern "C" fn(obj: *mut Object)> =
None;
}
diff --git a/rust/qemu-api/src/definitions.rs b/rust/qemu-api/src/definitions.rs
index 26597934bbd..92b3c6f9118 100644
--- a/rust/qemu-api/src/definitions.rs
+++ b/rust/qemu-api/src/definitions.rs
@@ -14,10 +14,10 @@ pub trait ObjectImpl {
const TYPE_INFO: TypeInfo;
const TYPE_NAME: &'static CStr;
const PARENT_TYPE_NAME: Option<&'static CStr>;
- const ABSTRACT: bool;
- const INSTANCE_INIT: Option<unsafe extern "C" fn(obj: *mut Object)>;
- const INSTANCE_POST_INIT: Option<unsafe extern "C" fn(obj: *mut Object)>;
- const INSTANCE_FINALIZE: Option<unsafe extern "C" fn(obj: *mut Object)>;
+ const ABSTRACT: bool = false;
+ const INSTANCE_INIT: Option<unsafe extern "C" fn(obj: *mut Object)> = None;
+ const INSTANCE_POST_INIT: Option<unsafe extern "C" fn(obj: *mut Object)> =
None;
+ const INSTANCE_FINALIZE: Option<unsafe extern "C" fn(obj: *mut Object)> =
None;
}
pub trait Class {
diff --git a/rust/qemu-api/tests/tests.rs b/rust/qemu-api/tests/tests.rs
index 925f5a3c77b..f793ff26e5d 100644
--- a/rust/qemu-api/tests/tests.rs
+++ b/rust/qemu-api/tests/tests.rs
@@ -58,10 +58,6 @@ impl ObjectImpl for DummyState {
const TYPE_INFO: qemu_api::bindings::TypeInfo = qemu_api::type_info! {
Self };
const TYPE_NAME: &'static CStr = c_str!("dummy");
const PARENT_TYPE_NAME: Option<&'static CStr> =
Some(device_class::TYPE_DEVICE);
- const ABSTRACT: bool = false;
- const INSTANCE_INIT: Option<unsafe extern "C" fn(obj: *mut Object)> =
None;
- const INSTANCE_POST_INIT: Option<unsafe extern "C" fn(obj: *mut
Object)> = None;
- const INSTANCE_FINALIZE: Option<unsafe extern "C" fn(obj: *mut
Object)> = None;
}
impl Class for DummyClass {
--
2.47.0
- [PATCH 0/8] rust: qom: move bridge for TypeInfo and DeviceClass functions to common code, Paolo Bonzini, 2024/11/25
- [PATCH 1/8] rust: qom: add default definitions for ObjectImpl,
Paolo Bonzini <=
- [PATCH 2/8] rust: qom: rename Class trait to ClassInitImpl, Paolo Bonzini, 2024/11/25
- [PATCH 5/8] rust: qdev: move device_class_init! body to generic function, ClassInitImpl implementation to macro, Paolo Bonzini, 2024/11/25
- [PATCH 7/8] rust: qom: automatically use Drop trait to implement instance_finalize, Paolo Bonzini, 2024/11/25
- [PATCH 8/8] rust: qom: move bridge for TypeInfo functions out of pl011, Paolo Bonzini, 2024/11/25
- [PATCH 6/8] rust: qdev: move bridge for realize and reset functions out of pl011, Paolo Bonzini, 2024/11/25
- [PATCH 3/8] rust: qom: convert type_info! macro to an associated const, Paolo Bonzini, 2024/11/25
- [PATCH 4/8] rust: qom: move ClassInitImpl to the instance side, Paolo Bonzini, 2024/11/25