mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-21 17:11:57 -06:00
rust: vmstate: remove translation of C vmstate macros
Keep vmstate_clock!; because it uses a field of type VMStateDescription, it cannot be converted to the VMState trait without access to the const_refs_static feature. Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini
parent
b800a31321
commit
9d4899496b
1 changed files with 23 additions and 251 deletions
|
|
@ -21,8 +21,8 @@
|
||||||
//! [`vmstate_fields`](crate::vmstate_fields).
|
//! [`vmstate_fields`](crate::vmstate_fields).
|
||||||
//!
|
//!
|
||||||
//! * direct equivalents to the C macros declared in
|
//! * direct equivalents to the C macros declared in
|
||||||
//! `include/migration/vmstate.h`. These are not type-safe and should not be
|
//! `include/migration/vmstate.h`. These are not type-safe and only provide
|
||||||
//! used if the equivalent functionality is available with `vmstate_of!`.
|
//! functionality that is missing from `vmstate_of!`.
|
||||||
|
|
||||||
use core::{marker::PhantomData, mem, ptr::NonNull};
|
use core::{marker::PhantomData, mem, ptr::NonNull};
|
||||||
|
|
||||||
|
|
@ -407,223 +407,16 @@ unsafe impl<T: VMState, const N: usize> VMState for [T; N] {
|
||||||
const BASE: VMStateField = <T as VMState>::BASE.with_array_flag(N);
|
const BASE: VMStateField = <T as VMState>::BASE.with_array_flag(N);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_UNUSED_BUFFER")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_unused_buffer {
|
|
||||||
($field_exists_fn:expr, $version_id:expr, $size:expr) => {{
|
|
||||||
$crate::bindings::VMStateField {
|
|
||||||
name: c_str!("unused").as_ptr(),
|
|
||||||
err_hint: ::core::ptr::null(),
|
|
||||||
offset: 0,
|
|
||||||
size: $size,
|
|
||||||
start: 0,
|
|
||||||
num: 0,
|
|
||||||
num_offset: 0,
|
|
||||||
size_offset: 0,
|
|
||||||
info: unsafe { ::core::ptr::addr_of!($crate::bindings::vmstate_info_unused_buffer) },
|
|
||||||
flags: VMStateFlags::VMS_BUFFER,
|
|
||||||
vmsd: ::core::ptr::null(),
|
|
||||||
version_id: $version_id,
|
|
||||||
struct_version_id: 0,
|
|
||||||
field_exists: $field_exists_fn,
|
|
||||||
}
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_UNUSED_V")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_unused_v {
|
|
||||||
($version_id:expr, $size:expr) => {{
|
|
||||||
$crate::vmstate_unused_buffer!(None, $version_id, $size)
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_UNUSED")]
|
#[doc(alias = "VMSTATE_UNUSED")]
|
||||||
#[macro_export]
|
#[macro_export]
|
||||||
macro_rules! vmstate_unused {
|
macro_rules! vmstate_unused {
|
||||||
($size:expr) => {{
|
($size:expr) => {{
|
||||||
$crate::vmstate_unused_v!(0, $size)
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_SINGLE_TEST")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_single_test {
|
|
||||||
($field_name:ident, $struct_name:ty, $field_exists_fn:expr, $version_id:expr, $info:expr, $size:expr) => {{
|
|
||||||
$crate::bindings::VMStateField {
|
$crate::bindings::VMStateField {
|
||||||
name: ::core::concat!(::core::stringify!($field_name), 0)
|
name: $crate::c_str!("unused").as_ptr(),
|
||||||
.as_bytes()
|
|
||||||
.as_ptr() as *const ::std::os::raw::c_char,
|
|
||||||
err_hint: ::core::ptr::null(),
|
|
||||||
offset: $crate::offset_of!($struct_name, $field_name),
|
|
||||||
size: $size,
|
size: $size,
|
||||||
start: 0,
|
info: unsafe { ::core::ptr::addr_of!($crate::bindings::vmstate_info_unused_buffer) },
|
||||||
num: 0,
|
flags: $crate::bindings::VMStateFlags::VMS_BUFFER,
|
||||||
num_offset: 0,
|
..$crate::zeroable::Zeroable::ZERO
|
||||||
size_offset: 0,
|
|
||||||
info: unsafe { $info },
|
|
||||||
flags: VMStateFlags::VMS_SINGLE,
|
|
||||||
vmsd: ::core::ptr::null(),
|
|
||||||
version_id: $version_id,
|
|
||||||
struct_version_id: 0,
|
|
||||||
field_exists: $field_exists_fn,
|
|
||||||
}
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_SINGLE")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_single {
|
|
||||||
($field_name:ident, $struct_name:ty, $version_id:expr, $info:expr, $size:expr) => {{
|
|
||||||
$crate::vmstate_single_test!($field_name, $struct_name, None, $version_id, $info, $size)
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_UINT32_V")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_uint32_v {
|
|
||||||
($field_name:ident, $struct_name:ty, $version_id:expr) => {{
|
|
||||||
$crate::vmstate_single!(
|
|
||||||
$field_name,
|
|
||||||
$struct_name,
|
|
||||||
$version_id,
|
|
||||||
::core::ptr::addr_of!($crate::bindings::vmstate_info_uint32),
|
|
||||||
::core::mem::size_of::<u32>()
|
|
||||||
)
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_UINT32")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_uint32 {
|
|
||||||
($field_name:ident, $struct_name:ty) => {{
|
|
||||||
$crate::vmstate_uint32_v!($field_name, $struct_name, 0)
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_ARRAY")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_array {
|
|
||||||
($field_name:ident, $struct_name:ty, $length:expr, $version_id:expr, $info:expr, $size:expr) => {{
|
|
||||||
$crate::bindings::VMStateField {
|
|
||||||
name: ::core::concat!(::core::stringify!($field_name), 0)
|
|
||||||
.as_bytes()
|
|
||||||
.as_ptr() as *const ::std::os::raw::c_char,
|
|
||||||
err_hint: ::core::ptr::null(),
|
|
||||||
offset: $crate::offset_of!($struct_name, $field_name),
|
|
||||||
size: $size,
|
|
||||||
start: 0,
|
|
||||||
num: $length as _,
|
|
||||||
num_offset: 0,
|
|
||||||
size_offset: 0,
|
|
||||||
info: unsafe { $info },
|
|
||||||
flags: VMStateFlags::VMS_ARRAY,
|
|
||||||
vmsd: ::core::ptr::null(),
|
|
||||||
version_id: $version_id,
|
|
||||||
struct_version_id: 0,
|
|
||||||
field_exists: None,
|
|
||||||
}
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_UINT32_ARRAY_V")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_uint32_array_v {
|
|
||||||
($field_name:ident, $struct_name:ty, $length:expr, $version_id:expr) => {{
|
|
||||||
$crate::vmstate_array!(
|
|
||||||
$field_name,
|
|
||||||
$struct_name,
|
|
||||||
$length,
|
|
||||||
$version_id,
|
|
||||||
::core::ptr::addr_of!($crate::bindings::vmstate_info_uint32),
|
|
||||||
::core::mem::size_of::<u32>()
|
|
||||||
)
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_UINT32_ARRAY")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_uint32_array {
|
|
||||||
($field_name:ident, $struct_name:ty, $length:expr) => {{
|
|
||||||
$crate::vmstate_uint32_array_v!($field_name, $struct_name, $length, 0)
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_STRUCT_POINTER_V")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_struct_pointer_v {
|
|
||||||
($field_name:ident, $struct_name:ty, $version_id:expr, $vmsd:expr, $type:ty) => {{
|
|
||||||
$crate::bindings::VMStateField {
|
|
||||||
name: ::core::concat!(::core::stringify!($field_name), 0)
|
|
||||||
.as_bytes()
|
|
||||||
.as_ptr() as *const ::std::os::raw::c_char,
|
|
||||||
err_hint: ::core::ptr::null(),
|
|
||||||
offset: $crate::offset_of!($struct_name, $field_name),
|
|
||||||
size: ::core::mem::size_of::<*const $type>(),
|
|
||||||
start: 0,
|
|
||||||
num: 0,
|
|
||||||
num_offset: 0,
|
|
||||||
size_offset: 0,
|
|
||||||
info: ::core::ptr::null(),
|
|
||||||
flags: VMStateFlags(VMStateFlags::VMS_STRUCT.0 | VMStateFlags::VMS_POINTER.0),
|
|
||||||
vmsd: unsafe { $vmsd },
|
|
||||||
version_id: $version_id,
|
|
||||||
struct_version_id: 0,
|
|
||||||
field_exists: None,
|
|
||||||
}
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_ARRAY_OF_POINTER")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_array_of_pointer {
|
|
||||||
($field_name:ident, $struct_name:ty, $num:expr, $version_id:expr, $info:expr, $type:ty) => {{
|
|
||||||
$crate::bindings::VMStateField {
|
|
||||||
name: ::core::concat!(::core::stringify!($field_name), 0)
|
|
||||||
.as_bytes()
|
|
||||||
.as_ptr() as *const ::std::os::raw::c_char,
|
|
||||||
version_id: $version_id,
|
|
||||||
num: $num as _,
|
|
||||||
info: unsafe { $info },
|
|
||||||
size: ::core::mem::size_of::<*const $type>(),
|
|
||||||
flags: VMStateFlags(VMStateFlags::VMS_ARRAY.0 | VMStateFlags::VMS_ARRAY_OF_POINTER.0),
|
|
||||||
offset: $crate::offset_of!($struct_name, $field_name),
|
|
||||||
err_hint: ::core::ptr::null(),
|
|
||||||
start: 0,
|
|
||||||
num_offset: 0,
|
|
||||||
size_offset: 0,
|
|
||||||
vmsd: ::core::ptr::null(),
|
|
||||||
struct_version_id: 0,
|
|
||||||
field_exists: None,
|
|
||||||
}
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_ARRAY_OF_POINTER_TO_STRUCT")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_array_of_pointer_to_struct {
|
|
||||||
($field_name:ident, $struct_name:ty, $num:expr, $version_id:expr, $vmsd:expr, $type:ty) => {{
|
|
||||||
$crate::bindings::VMStateField {
|
|
||||||
name: ::core::concat!(::core::stringify!($field_name), 0)
|
|
||||||
.as_bytes()
|
|
||||||
.as_ptr() as *const ::std::os::raw::c_char,
|
|
||||||
version_id: $version_id,
|
|
||||||
num: $num as _,
|
|
||||||
vmsd: unsafe { $vmsd },
|
|
||||||
size: ::core::mem::size_of::<*const $type>(),
|
|
||||||
flags: VMStateFlags(
|
|
||||||
VMStateFlags::VMS_ARRAY.0
|
|
||||||
| VMStateFlags::VMS_STRUCT.0
|
|
||||||
| VMStateFlags::VMS_ARRAY_OF_POINTER.0,
|
|
||||||
),
|
|
||||||
offset: $crate::offset_of!($struct_name, $field_name),
|
|
||||||
err_hint: ::core::ptr::null(),
|
|
||||||
start: 0,
|
|
||||||
num_offset: 0,
|
|
||||||
size_offset: 0,
|
|
||||||
vmsd: ::core::ptr::null(),
|
|
||||||
struct_version_id: 0,
|
|
||||||
field_exists: None,
|
|
||||||
}
|
}
|
||||||
}};
|
}};
|
||||||
}
|
}
|
||||||
|
|
@ -661,48 +454,27 @@ macro_rules! vmstate_struct {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_CLOCK_V")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_clock_v {
|
|
||||||
($field_name:ident, $struct_name:ty, $version_id:expr) => {{
|
|
||||||
$crate::vmstate_struct_pointer_v!(
|
|
||||||
$field_name,
|
|
||||||
$struct_name,
|
|
||||||
$version_id,
|
|
||||||
::core::ptr::addr_of!($crate::bindings::vmstate_clock),
|
|
||||||
$crate::bindings::Clock
|
|
||||||
)
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_CLOCK")]
|
#[doc(alias = "VMSTATE_CLOCK")]
|
||||||
#[macro_export]
|
#[macro_export]
|
||||||
macro_rules! vmstate_clock {
|
macro_rules! vmstate_clock {
|
||||||
($field_name:ident, $struct_name:ty) => {{
|
($field_name:ident, $struct_name:ty) => {{
|
||||||
$crate::vmstate_clock_v!($field_name, $struct_name, 0)
|
$crate::bindings::VMStateField {
|
||||||
}};
|
name: ::core::concat!(::core::stringify!($field_name), "\0")
|
||||||
}
|
.as_bytes()
|
||||||
|
.as_ptr() as *const ::std::os::raw::c_char,
|
||||||
#[doc(alias = "VMSTATE_ARRAY_CLOCK_V")]
|
offset: {
|
||||||
#[macro_export]
|
$crate::assert_field_type!(
|
||||||
macro_rules! vmstate_array_clock_v {
|
$struct_name,
|
||||||
($field_name:ident, $struct_name:ty, $num:expr, $version_id:expr) => {{
|
$field_name,
|
||||||
$crate::vmstate_array_of_pointer_to_struct!(
|
core::ptr::NonNull<$crate::bindings::Clock>
|
||||||
$field_name,
|
);
|
||||||
$struct_name,
|
$crate::offset_of!($struct_name, $field_name)
|
||||||
$num,
|
},
|
||||||
$version_id,
|
size: ::core::mem::size_of::<*const $crate::bindings::Clock>(),
|
||||||
::core::ptr::addr_of!($crate::bindings::vmstate_clock),
|
flags: VMStateFlags(VMStateFlags::VMS_STRUCT.0 | VMStateFlags::VMS_POINTER.0),
|
||||||
$crate::bindings::Clock
|
vmsd: unsafe { ::core::ptr::addr_of!($crate::bindings::vmstate_clock) },
|
||||||
)
|
..$crate::zeroable::Zeroable::ZERO
|
||||||
}};
|
}
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(alias = "VMSTATE_ARRAY_CLOCK")]
|
|
||||||
#[macro_export]
|
|
||||||
macro_rules! vmstate_array_clock {
|
|
||||||
($field_name:ident, $struct_name:ty, $num:expr) => {{
|
|
||||||
$crate::vmstate_array_clock_v!($field_name, $struct_name, $name, 0)
|
|
||||||
}};
|
}};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue