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 06/17] rust/vmstate: Fix size field of VMStateField with VMS_ARRAY_OF_POINTER flag
Date: Mon, 17 Mar 2025 23:12:25 +0800 [thread overview]
Message-ID: <20250317151236.536673-7-zhao1.liu@intel.com> (raw)
In-Reply-To: <20250317151236.536673-1-zhao1.liu@intel.com>
The `size` field of the VMStateField with VMS_ARRAY_OF_POINTER flag
should stores the size of pointer, which depends on platform.
Currently, `*const`, `*mut`, `NonNull`, `Box<>` and their wrapper are
supported, and they have the same size as `usize`.
Store the size (of `usize`) when VMS_ARRAY_OF_POINTER flag is set.
The size may be changed when more smart pointers are supported, but now
the size of "usize" is enough.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
rust/qemu-api/src/vmstate.rs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rust/qemu-api/src/vmstate.rs b/rust/qemu-api/src/vmstate.rs
index e877ee5e391d..5af75b4777e9 100644
--- a/rust/qemu-api/src/vmstate.rs
+++ b/rust/qemu-api/src/vmstate.rs
@@ -256,6 +256,10 @@ pub const fn with_array_flag(mut self, num: usize) -> Self {
if (self.flags.0 & VMStateFlags::VMS_POINTER.0) != 0 {
self.flags = VMStateFlags(self.flags.0 & !VMStateFlags::VMS_POINTER.0);
self.flags = VMStateFlags(self.flags.0 | VMStateFlags::VMS_ARRAY_OF_POINTER.0);
+ // VMS_ARRAY_OF_POINTER flag stores the size of pointer.
+ // FIXME: *const, *mut, NonNull and Box<> have the same size as usize.
+ // Resize if more smart pointers are supported.
+ self.size = std::mem::size_of::<usize>();
}
self.flags = VMStateFlags(self.flags.0 & !VMStateFlags::VMS_SINGLE.0);
self.flags = VMStateFlags(self.flags.0 | VMStateFlags::VMS_ARRAY.0);
--
2.34.1
next prev parent reply other threads:[~2025-03-17 14:54 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 ` Zhao Liu [this message]
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 ` [PATCH 15/17] rust/vmstate: Add unit test for vmstate_{of|struct} macro Zhao Liu
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-7-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).