fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rust: migration: allow nested offset_of

Browse source 
Nested offset_of was stabilized in Rust 1.82.  Since the minimum
supported version for QEMU is 1.83, allow nested field accesses
in vmstate_of!

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-12-21 16:53:29 +01:00
parent 02d6b8cfd3
commit ac561a3050
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rust/migration/src/vmstate.rs
View file

@ -141,24 +141,24 @@ pub const fn vmstate_varray_flag<T: VMState>(_: PhantomData<T>) -> VMStateFlags
/// [`Owned`]: ../../qom/qom/struct.Owned.html /// [`Owned`]: ../../qom/qom/struct.Owned.html
#[macro_export] #[macro_export]
macro_rules! vmstate_of { macro_rules! vmstate_of {
($struct_name:ty, $field_name:ident $([0 .. $num:ident $(* $factor:expr)?])? $(, $test_fn:expr)? $(,)?) => { ($struct_name:ty, $($field_name:ident).+ $([0 .. $($num:ident).+ $(* $factor:expr)?])? $(, $test_fn:expr)? $(,)?) => {
$crate::bindings::VMStateField { $crate::bindings::VMStateField {
name: ::core::concat!(::core::stringify!($field_name), "\0") name: ::core::concat!(::core::stringify!($($field_name).+), "\0")
.as_bytes() .as_bytes()
.as_ptr().cast::<::std::os::raw::c_char>(), .as_ptr().cast::<::std::os::raw::c_char>(),
offset: ::std::mem::offset_of!($struct_name, $field_name), offset: ::std::mem::offset_of!($struct_name, $($field_name).+),
$(num_offset: ::std::mem::offset_of!($struct_name, $num),)? $(num_offset: ::std::mem::offset_of!($struct_name, $($num).+),)?
$(field_exists: $crate::vmstate_exist_fn!($struct_name, $test_fn),)? $(field_exists: $crate::vmstate_exist_fn!($struct_name, $test_fn),)?
// The calls to `call_func_with_field!` are the magic that // The calls to `call_func_with_field!` are the magic that
// computes most of the VMStateField from the type of the field. // computes most of the VMStateField from the type of the field.
..$crate::call_func_with_field!( ..$crate::call_func_with_field!(
$crate::vmstate::vmstate_base, $crate::vmstate::vmstate_base,
$struct_name, $struct_name,
$field_name $($field_name).+
)$(.with_varray_flag($crate::call_func_with_field!( )$(.with_varray_flag($crate::call_func_with_field!(
$crate::vmstate::vmstate_varray_flag, $crate::vmstate::vmstate_varray_flag,
$struct_name, $struct_name,
$num)) $($num).+))
$(.with_varray_multiply($factor))?)? $(.with_varray_multiply($factor))?)?
} }
}; };