From: Zhao Liu <zhao1.liu@intel.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org, qemu-rust@nongnu.org,
Zhao Liu <zhao1.liu@intel.com>
Subject: [PATCH 15/17] rust/vmstate: Add unit test for vmstate_{of|struct} macro
Date: Mon, 17 Mar 2025 23:12:34 +0800 [thread overview]
Message-ID: <20250317151236.536673-16-zhao1.liu@intel.com> (raw)
In-Reply-To: <20250317151236.536673-1-zhao1.liu@intel.com>
Add a unit test to cover some patterns accepted by vmstate_of and
vmstate_struct macros, which correspond to the following C version
macros:
* VMSTATE_BOOL_V
* VMSTATE_U64
* VMSTATE_STRUCT_VARRAY_UINT8
* (no C version) MULTIPLY variant of VMSTATE_STRUCT_VARRAY_UINT32
* VMSTATE_ARRAY
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
rust/qemu-api/tests/vmstate_tests.rs | 144 ++++++++++++++++++++++++++-
1 file changed, 142 insertions(+), 2 deletions(-)
diff --git a/rust/qemu-api/tests/vmstate_tests.rs b/rust/qemu-api/tests/vmstate_tests.rs
index 25b28b298066..27df66b5766e 100644
--- a/rust/qemu-api/tests/vmstate_tests.rs
+++ b/rust/qemu-api/tests/vmstate_tests.rs
@@ -5,10 +5,14 @@
use std::{ffi::CStr, mem::size_of, slice};
use qemu_api::{
- bindings::{vmstate_info_int8, vmstate_info_uint8, vmstate_info_unused_buffer},
+ bindings::{
+ vmstate_info_bool, vmstate_info_int64, vmstate_info_int8, vmstate_info_uint64,
+ vmstate_info_uint8, vmstate_info_unused_buffer,
+ },
c_str,
+ cell::BqlCell,
vmstate::{VMStateDescription, VMStateField, VMStateFlags},
- vmstate_fields, vmstate_of, vmstate_unused,
+ vmstate_fields, vmstate_of, vmstate_struct, vmstate_unused,
zeroable::Zeroable,
};
@@ -125,3 +129,139 @@ fn test_vmstate_macro_fooa() {
// The last VMStateField in VMSTATE_FOOA.
assert_eq!(foo_fields[4].flags, VMStateFlags::VMS_END);
}
+
+// =========================== Test VMSTATE_FOOB ===========================
+// Test the use cases of the vmstate macro, corresponding to the following C
+// macro variants:
+// * VMSTATE_FOOB:
+// - VMSTATE_BOOL_V
+// - VMSTATE_U64
+// - VMSTATE_STRUCT_VARRAY_UINT8
+// - (no C version) MULTIPLY variant of VMSTATE_STRUCT_VARRAY_UINT32
+// - VMSTATE_ARRAY
+#[repr(C)]
+#[derive(qemu_api_macros::offsets)]
+struct FooB {
+ arr_a: [FooA; FOO_ARRAY_MAX],
+ num_a: u8,
+ arr_a_mul: [FooA; FOO_ARRAY_MAX],
+ num_a_mul: u32,
+ wrap: BqlCell<u64>,
+ val: bool,
+ // FIXME: Use Timer array. Now we can't since it's hard to link savevm.c to test.
+ arr_i64: [i64; FOO_ARRAY_MAX],
+}
+
+static VMSTATE_FOOB: VMStateDescription = VMStateDescription {
+ name: c_str!("foo_b").as_ptr(),
+ version_id: 2,
+ minimum_version_id: 1,
+ fields: vmstate_fields! {
+ vmstate_of!(FooB, val, version = 2),
+ vmstate_of!(FooB, wrap),
+ vmstate_struct!(FooB, arr_a, [0 .. num_a], VMSTATE_FOOA, FooA, version = 1),
+ vmstate_struct!(FooB, arr_a_mul, [0 .. num_a_mul * 32], VMSTATE_FOOA, FooA, version = 2),
+ vmstate_of!(FooB, arr_i64),
+ },
+ ..Zeroable::ZERO
+};
+
+#[test]
+fn test_vmstate_macro_foob() {
+ let foo_fields: &[VMStateField] = unsafe { slice::from_raw_parts(VMSTATE_FOOB.fields, 6) };
+
+ // 1st VMStateField ("val") in VMSTATE_FOOB (corresponding to VMSTATE_BOOL_V)
+ assert_eq!(
+ unsafe { CStr::from_ptr(foo_fields[0].name) }.to_bytes_with_nul(),
+ b"val\0"
+ );
+ assert_eq!(foo_fields[0].offset, 136);
+ assert_eq!(foo_fields[0].num_offset, 0);
+ assert_eq!(foo_fields[0].info, unsafe {
+ ::core::ptr::addr_of!(vmstate_info_bool)
+ });
+ assert_eq!(foo_fields[0].version_id, 2);
+ assert_eq!(foo_fields[0].size, 1);
+ assert_eq!(foo_fields[0].num, 0);
+ assert_eq!(foo_fields[0].flags, VMStateFlags::VMS_SINGLE);
+ assert_eq!(foo_fields[0].vmsd.is_null(), true);
+ assert_eq!(foo_fields[0].field_exists.is_none(), true);
+
+ // 2nd VMStateField ("wrap") in VMSTATE_FOOB (corresponding to VMSTATE_U64)
+ assert_eq!(
+ unsafe { CStr::from_ptr(foo_fields[1].name) }.to_bytes_with_nul(),
+ b"wrap\0"
+ );
+ assert_eq!(foo_fields[1].offset, 128);
+ assert_eq!(foo_fields[1].num_offset, 0);
+ assert_eq!(foo_fields[1].info, unsafe {
+ ::core::ptr::addr_of!(vmstate_info_uint64)
+ });
+ assert_eq!(foo_fields[1].version_id, 0);
+ assert_eq!(foo_fields[1].size, 8);
+ assert_eq!(foo_fields[1].num, 0);
+ assert_eq!(foo_fields[1].flags, VMStateFlags::VMS_SINGLE);
+ assert_eq!(foo_fields[1].vmsd.is_null(), true);
+ assert_eq!(foo_fields[1].field_exists.is_none(), true);
+
+ // 3rd VMStateField ("arr_a") in VMSTATE_FOOB (corresponding to
+ // VMSTATE_STRUCT_VARRAY_UINT8)
+ assert_eq!(
+ unsafe { CStr::from_ptr(foo_fields[2].name) }.to_bytes_with_nul(),
+ b"arr_a\0"
+ );
+ assert_eq!(foo_fields[2].offset, 0);
+ assert_eq!(foo_fields[2].num_offset, 60);
+ assert_eq!(foo_fields[2].info.is_null(), true); // VMSTATE_STRUCT_VARRAY_UINT8 doesn't set info field.
+ assert_eq!(foo_fields[2].version_id, 1);
+ assert_eq!(foo_fields[2].size, 20);
+ assert_eq!(foo_fields[2].num, 0);
+ assert_eq!(
+ foo_fields[2].flags.0,
+ VMStateFlags::VMS_STRUCT.0 | VMStateFlags::VMS_VARRAY_UINT8.0
+ );
+ assert_eq!(foo_fields[2].vmsd, &VMSTATE_FOOA);
+ assert_eq!(foo_fields[2].field_exists.is_none(), true);
+
+ // 4th VMStateField ("arr_a_mul") in VMSTATE_FOOB (corresponding to
+ // (no C version) MULTIPLY variant of VMSTATE_STRUCT_VARRAY_UINT32)
+ assert_eq!(
+ unsafe { CStr::from_ptr(foo_fields[3].name) }.to_bytes_with_nul(),
+ b"arr_a_mul\0"
+ );
+ assert_eq!(foo_fields[3].offset, 64);
+ assert_eq!(foo_fields[3].num_offset, 124);
+ assert_eq!(foo_fields[3].info.is_null(), true); // VMSTATE_STRUCT_VARRAY_UINT8 doesn't set info field.
+ assert_eq!(foo_fields[3].version_id, 2);
+ assert_eq!(foo_fields[3].size, 20);
+ assert_eq!(foo_fields[3].num, 32);
+ assert_eq!(
+ foo_fields[3].flags.0,
+ VMStateFlags::VMS_STRUCT.0
+ | VMStateFlags::VMS_VARRAY_UINT32.0
+ | VMStateFlags::VMS_MULTIPLY_ELEMENTS.0
+ );
+ assert_eq!(foo_fields[3].vmsd, &VMSTATE_FOOA);
+ assert_eq!(foo_fields[3].field_exists.is_none(), true);
+
+ // 5th VMStateField ("arr_i64") in VMSTATE_FOOB (corresponding to
+ // VMSTATE_ARRAY)
+ assert_eq!(
+ unsafe { CStr::from_ptr(foo_fields[4].name) }.to_bytes_with_nul(),
+ b"arr_i64\0"
+ );
+ assert_eq!(foo_fields[4].offset, 144);
+ assert_eq!(foo_fields[4].num_offset, 0);
+ assert_eq!(foo_fields[4].info, unsafe {
+ ::core::ptr::addr_of!(vmstate_info_int64)
+ });
+ assert_eq!(foo_fields[4].version_id, 0);
+ assert_eq!(foo_fields[4].size, 8);
+ assert_eq!(foo_fields[4].num, FOO_ARRAY_MAX as i32);
+ assert_eq!(foo_fields[4].flags, VMStateFlags::VMS_ARRAY);
+ assert_eq!(foo_fields[4].vmsd.is_null(), true);
+ assert_eq!(foo_fields[4].field_exists.is_none(), true);
+
+ // The last VMStateField in VMSTATE_FOOB.
+ assert_eq!(foo_fields[5].flags, VMStateFlags::VMS_END);
+}
--
2.34.1
next prev parent reply other threads:[~2025-03-17 14:53 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-17 15:12 [PATCH 00/17] rust/vmstate: Clean up, fix, enhance & test Zhao Liu
2025-03-17 15:12 ` [PATCH 01/17] rust/vmstate: Remove unnecessary unsafe Zhao Liu
2025-03-17 15:12 ` [PATCH 02/17] rust/vmstate: Fix num_offset in vmstate macros Zhao Liu
2025-03-17 15:12 ` [PATCH 03/17] rust/vmstate: Add a prefix separator ", " for the array field " Zhao Liu
2025-03-17 16:37 ` Paolo Bonzini
2025-03-18 2:41 ` Zhao Liu
2025-03-17 15:12 ` [PATCH 04/17] rust/vmstate: Use ident instead of expr to parse vmsd in vmstate_struct macro Zhao Liu
2025-03-17 17:17 ` Paolo Bonzini
2025-03-18 2:46 ` Zhao Liu
2025-03-18 6:14 ` Zhao Liu
2025-03-17 15:12 ` [PATCH 05/17] rust/vmstate: Fix num field when varray flags are set Zhao Liu
2025-03-17 15:12 ` [PATCH 06/17] rust/vmstate: Fix size field of VMStateField with VMS_ARRAY_OF_POINTER flag Zhao Liu
2025-03-17 15:12 ` [PATCH 07/17] rust/vmstate: Fix type check for varray in vmstate_struct Zhao Liu
2025-03-17 15:12 ` [PATCH 08/17] rust/vmstate: Fix "cannot infer type" error " Zhao Liu
2025-03-17 15:12 ` [PATCH 09/17] rust/vmstate: Fix unnecessary VMState bound of with_varray_flag() Zhao Liu
2025-03-17 15:12 ` [PATCH 10/17] rust/vmstate: Relax array check when build varray in vmstate_struct Zhao Liu
2025-03-17 15:12 ` [PATCH 11/17] rust/vmstate: Re-implement VMState trait for timer binding Zhao Liu
2025-03-17 15:12 ` [PATCH 12/17] rust/vmstate: Support version field in vmstate macros Zhao Liu
2025-03-17 16:38 ` Paolo Bonzini
2025-03-18 3:08 ` Zhao Liu
2025-03-17 15:12 ` [PATCH 13/17] rust/vmstate: Support vmstate_validate Zhao Liu
2025-03-17 17:18 ` Paolo Bonzini
2025-03-18 6:36 ` Zhao Liu
2025-03-18 6:34 ` Paolo Bonzini
2025-03-18 7:20 ` Zhao Liu
2025-03-17 15:12 ` [PATCH 14/17] rust/vmstate: Add unit test for vmstate_of macro Zhao Liu
2025-03-17 17:11 ` Paolo Bonzini
2025-03-18 6:45 ` Zhao Liu
2025-03-17 15:12 ` Zhao Liu [this message]
2025-03-17 15:12 ` [PATCH 16/17] rust/vmstate: Add unit test for pointer case Zhao Liu
2025-03-17 15:12 ` [PATCH 17/17] rust/vmstate: Add unit test for vmstate_validate Zhao Liu
2025-03-17 17:20 ` [PATCH 00/17] rust/vmstate: Clean up, fix, enhance & test Paolo Bonzini
2025-03-18 6:49 ` Zhao Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250317151236.536673-16-zhao1.liu@intel.com \
--to=zhao1.liu@intel.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-rust@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).