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 v3 15/15] rust/vmstate: Include complete crate path of VMStateFlags in vmstate_clock
Date: Tue, 18 Mar 2025 21:02:19 +0800 [thread overview]
Message-ID: <20250318130219.1799170-16-zhao1.liu@intel.com> (raw)
In-Reply-To: <20250318130219.1799170-1-zhao1.liu@intel.com>
The use of "bindings::*" masks incomplete path of VMStateFlags.
Include complete crate path of VMStateFlags in vmstate_clock, and clean
up "bindings::*" in device_class.rs of pl011.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
Changes since v2:
* A new commit.
---
rust/hw/char/pl011/src/device_class.rs | 8 ++++++--
rust/qemu-api/src/vmstate.rs | 5 ++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/rust/hw/char/pl011/src/device_class.rs b/rust/hw/char/pl011/src/device_class.rs
index 0b2076ddaa0f..b4d4a7eb432d 100644
--- a/rust/hw/char/pl011/src/device_class.rs
+++ b/rust/hw/char/pl011/src/device_class.rs
@@ -8,8 +8,12 @@
};
use qemu_api::{
- bindings::*, c_str, prelude::*, vmstate_clock, vmstate_fields, vmstate_of, vmstate_struct,
- vmstate_subsections, vmstate_unused, zeroable::Zeroable,
+ bindings::{qdev_prop_bool, qdev_prop_chr},
+ c_str,
+ prelude::*,
+ vmstate::VMStateDescription,
+ vmstate_clock, vmstate_fields, vmstate_of, vmstate_struct, vmstate_subsections, vmstate_unused,
+ zeroable::Zeroable,
};
use crate::device::{PL011Registers, PL011State};
diff --git a/rust/qemu-api/src/vmstate.rs b/rust/qemu-api/src/vmstate.rs
index 9740931fb16a..1b2b12eadd6e 100644
--- a/rust/qemu-api/src/vmstate.rs
+++ b/rust/qemu-api/src/vmstate.rs
@@ -487,7 +487,10 @@ macro_rules! vmstate_clock {
$crate::offset_of!($struct_name, $field_name)
},
size: ::core::mem::size_of::<*const $crate::qdev::Clock>(),
- flags: VMStateFlags(VMStateFlags::VMS_STRUCT.0 | VMStateFlags::VMS_POINTER.0),
+ flags: $crate::bindings::VMStateFlags(
+ $crate::bindings::VMStateFlags::VMS_STRUCT.0
+ | $crate::bindings::VMStateFlags::VMS_POINTER.0,
+ ),
vmsd: unsafe { ::core::ptr::addr_of!($crate::bindings::vmstate_clock) },
..$crate::zeroable::Zeroable::ZERO
}
--
2.34.1
prev parent reply other threads:[~2025-03-18 12:48 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-18 13:02 [PATCH v3 00/15] rust/vmstate: Clean up, fix, enhance & test Zhao Liu
2025-03-18 13:02 ` [PATCH v3 01/15] rust/vmstate: Remove unnecessary unsafe Zhao Liu
2025-03-18 13:02 ` [PATCH v3 02/15] rust/vmstate: Fix num_offset in vmstate macros Zhao Liu
2025-03-18 13:02 ` [PATCH v3 03/15] rust/vmstate: Fix num field when varray flags are set Zhao Liu
2025-03-18 13:02 ` [PATCH v3 04/15] rust/vmstate: Fix size field of VMStateField with VMS_ARRAY_OF_POINTER flag Zhao Liu
2025-03-18 13:02 ` [PATCH v3 05/15] rust/vmstate: Fix type check for varray in vmstate_struct Zhao Liu
2025-03-18 13:02 ` [PATCH v3 06/15] rust/vmstate: Fix "cannot infer type" error " Zhao Liu
2025-03-18 13:02 ` [PATCH v3 07/15] rust/vmstate: Fix unnecessary VMState bound of with_varray_flag() Zhao Liu
2025-03-18 13:02 ` [PATCH v3 08/15] rust/vmstate: Relax array check when build varray in vmstate_struct Zhao Liu
2025-03-18 13:02 ` [PATCH v3 09/15] rust/vmstate: Re-implement VMState trait for timer binding Zhao Liu
2025-03-18 13:02 ` [PATCH v3 10/15] rust/vmstate: Support vmstate_validate Zhao Liu
2025-03-18 13:02 ` [PATCH v3 11/15] rust/vmstate: Add unit test for vmstate_of macro Zhao Liu
2025-03-18 13:02 ` [PATCH v3 12/15] rust/vmstate: Add unit test for vmstate_{of|struct} macro Zhao Liu
2025-03-18 13:02 ` [PATCH v3 13/15] rust/vmstate: Add unit test for pointer case Zhao Liu
2025-03-18 13:02 ` [PATCH v3 14/15] rust/vmstate: Add unit test for vmstate_validate Zhao Liu
2025-03-18 13:02 ` Zhao Liu [this message]
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=20250318130219.1799170-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).