From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Zhao Liu <zhao1.liu@intel.com>
Subject: [PULL 23/61] rust: add missing const markers for MSRV==1.83.0
Date: Sat, 13 Sep 2025 10:09:04 +0200 [thread overview]
Message-ID: <20250913080943.11710-24-pbonzini@redhat.com> (raw)
In-Reply-To: <20250913080943.11710-1-pbonzini@redhat.com>
Rust 1.83 allows more functions to be marked const.
Fix clippy with bumped minimum supported Rust version.
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Link: https://lore.kernel.org/r/20250908105005.2119297-5-pbonzini@redhat.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
rust/bits/src/lib.rs | 6 +++---
rust/qemu-api/src/assertions.rs | 4 ++--
rust/qemu-api/src/cell.rs | 6 ++----
rust/qemu-api/src/qom.rs | 6 +++---
rust/qemu-api/src/timer.rs | 2 +-
rust/qemu-api/src/uninit.rs | 6 +++---
6 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/rust/bits/src/lib.rs b/rust/bits/src/lib.rs
index d485d6bd110..e9d15ad0cb5 100644
--- a/rust/bits/src/lib.rs
+++ b/rust/bits/src/lib.rs
@@ -165,19 +165,19 @@ pub const fn into_bits(self) -> $type {
#[allow(dead_code)]
#[inline(always)]
- pub fn set(&mut self, rhs: Self) {
+ pub const fn set(&mut self, rhs: Self) {
self.0 |= rhs.0;
}
#[allow(dead_code)]
#[inline(always)]
- pub fn clear(&mut self, rhs: Self) {
+ pub const fn clear(&mut self, rhs: Self) {
self.0 &= !rhs.0;
}
#[allow(dead_code)]
#[inline(always)]
- pub fn toggle(&mut self, rhs: Self) {
+ pub const fn toggle(&mut self, rhs: Self) {
self.0 ^= rhs.0;
}
diff --git a/rust/qemu-api/src/assertions.rs b/rust/qemu-api/src/assertions.rs
index a2d38c877df..e74fa3ef826 100644
--- a/rust/qemu-api/src/assertions.rs
+++ b/rust/qemu-api/src/assertions.rs
@@ -81,8 +81,8 @@ macro_rules! assert_field_type {
(@internal $param_name:ident, $ti:ty, $t:ty, $($field:tt)*) => {
const _: () = {
#[allow(unused)]
- fn assert_field_type($param_name: &$t) {
- fn types_must_be_equal<T, U>(_: &T)
+ const fn assert_field_type($param_name: &$t) {
+ const fn types_must_be_equal<T, U>(_: &T)
where
T: $crate::assertions::EqType<Itself = U>,
{
diff --git a/rust/qemu-api/src/cell.rs b/rust/qemu-api/src/cell.rs
index 27063b049d5..148a13e3f56 100644
--- a/rust/qemu-api/src/cell.rs
+++ b/rust/qemu-api/src/cell.rs
@@ -980,8 +980,7 @@ pub unsafe fn from_raw<'a>(ptr: *mut T) -> &'a Self {
/// but the functions containing the dereference are usually safe. The
/// value returned from `uninit()` must be initialized and pinned before
/// calling them.
- #[allow(clippy::missing_const_for_fn)]
- pub unsafe fn uninit() -> Self {
+ pub const unsafe fn uninit() -> Self {
Self {
value: UnsafeCell::new(MaybeUninit::uninit()),
_pin: PhantomPinned,
@@ -997,8 +996,7 @@ pub unsafe fn uninit() -> Self {
/// but the functions containing the dereference are usually safe. The
/// value returned from `uninit()` must be pinned (and possibly initialized)
/// before calling them.
- #[allow(clippy::missing_const_for_fn)]
- pub unsafe fn zeroed() -> Self {
+ pub const unsafe fn zeroed() -> Self {
Self {
value: UnsafeCell::new(MaybeUninit::zeroed()),
_pin: PhantomPinned,
diff --git a/rust/qemu-api/src/qom.rs b/rust/qemu-api/src/qom.rs
index e20ee014cb1..014ffb1fd88 100644
--- a/rust/qemu-api/src/qom.rs
+++ b/rust/qemu-api/src/qom.rs
@@ -307,7 +307,7 @@ impl<T: ObjectType> ParentInit<'_, T> {
/// Fields beyond `Object` could be uninitialized and it's your
/// responsibility to avoid that they're used when the pointer is
/// dereferenced, either directly or through a cast.
- pub fn as_object_mut_ptr(&self) -> *mut bindings::Object {
+ pub const fn as_object_mut_ptr(&self) -> *mut bindings::Object {
self.as_object_ptr().cast_mut()
}
@@ -318,7 +318,7 @@ pub fn as_object_mut_ptr(&self) -> *mut bindings::Object {
/// Fields beyond `Object` could be uninitialized and it's your
/// responsibility to avoid that they're used when the pointer is
/// dereferenced, either directly or through a cast.
- pub fn as_object_ptr(&self) -> *const bindings::Object {
+ pub const fn as_object_ptr(&self) -> *const bindings::Object {
self.0.as_ptr().cast()
}
}
@@ -336,7 +336,7 @@ impl<'a, T: ObjectImpl> ParentInit<'a, T> {
/// However, while the fields of the resulting reference are initialized,
/// calls might use uninitialized fields of the subclass. It is your
/// responsibility to avoid this.
- pub unsafe fn upcast<U: ObjectType>(&self) -> &'a U
+ pub const unsafe fn upcast<U: ObjectType>(&self) -> &'a U
where
T::ParentType: IsA<U>,
{
diff --git a/rust/qemu-api/src/timer.rs b/rust/qemu-api/src/timer.rs
index 0a2d111d490..0daec62f926 100644
--- a/rust/qemu-api/src/timer.rs
+++ b/rust/qemu-api/src/timer.rs
@@ -39,7 +39,7 @@ impl Timer {
///
/// The timer must be initialized before it is armed with
/// [`modify`](Self::modify).
- pub unsafe fn new() -> Self {
+ pub const unsafe fn new() -> Self {
// SAFETY: requirements relayed to callers of Timer::new
Self(unsafe { Opaque::zeroed() })
}
diff --git a/rust/qemu-api/src/uninit.rs b/rust/qemu-api/src/uninit.rs
index 04123b4ae99..b0a829729dd 100644
--- a/rust/qemu-api/src/uninit.rs
+++ b/rust/qemu-api/src/uninit.rs
@@ -12,7 +12,7 @@ pub struct MaybeUninitField<'a, T, U> {
impl<'a, T, U> MaybeUninitField<'a, T, U> {
#[doc(hidden)]
- pub fn new(parent: &'a mut MaybeUninit<T>, child: *mut U) -> Self {
+ pub const fn new(parent: &'a mut MaybeUninit<T>, child: *mut U) -> Self {
MaybeUninitField { parent, child }
}
@@ -21,7 +21,7 @@ pub fn new(parent: &'a mut MaybeUninit<T>, child: *mut U) -> Self {
/// Because the `MaybeUninitField` remembers the containing object,
/// it is possible to use it in foreign APIs that initialize the
/// child.
- pub fn parent(f: &Self) -> *const T {
+ pub const fn parent(f: &Self) -> *const T {
f.parent.as_ptr()
}
@@ -30,7 +30,7 @@ pub fn parent(f: &Self) -> *const T {
/// Because the `MaybeUninitField` remembers the containing object,
/// it is possible to use it in foreign APIs that initialize the
/// child.
- pub fn parent_mut(f: &mut Self) -> *mut T {
+ pub const fn parent_mut(f: &mut Self) -> *mut T {
f.parent.as_mut_ptr()
}
}
--
2.51.0
next prev parent reply other threads:[~2025-09-13 8:21 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-13 8:08 [PULL 00/61] CPU, Rust, x86 changes for 2025-09-13 Paolo Bonzini
2025-09-13 8:08 ` [PULL 01/61] target/ppc: limit cpu_interrupt_exittb to system emulation Paolo Bonzini
2025-09-13 8:08 ` [PULL 02/61] target/sparc: limit cpu_check_irqs " Paolo Bonzini
2025-09-13 8:08 ` [PULL 03/61] target/i386: limit a20 " Paolo Bonzini
2025-09-13 8:08 ` [PULL 04/61] target-arm: remove uses of cpu_interrupt() for user-mode emulation Paolo Bonzini
2025-09-13 8:08 ` [PULL 05/61] user-exec: remove cpu_interrupt() stub Paolo Bonzini
2025-09-13 8:08 ` [PULL 06/61] treewide: clear bits of cs->interrupt_request with cpu_reset_interrupt() Paolo Bonzini
2025-09-13 8:08 ` [PULL 07/61] cpu-common: use atomic access for interrupt_request Paolo Bonzini
2025-09-13 8:08 ` [PULL 08/61] cpus: document that qemu_cpu_kick() can be used for BQL-less operation Paolo Bonzini
2025-09-13 8:08 ` [PULL 09/61] accel: use store_release/load_acquire for cross-thread exit_request Paolo Bonzini
2025-09-13 8:08 ` [PULL 10/61] accel: use atomic accesses for exit_request Paolo Bonzini
2025-09-13 8:08 ` [PULL 11/61] accel/tcg: create a thread-kick function for TCG Paolo Bonzini
2025-09-13 8:08 ` [PULL 12/61] accel/tcg: inline cpu_exit() Paolo Bonzini
2025-09-13 8:08 ` [PULL 13/61] cpus: remove TCG-ism from cpu_exit() Paolo Bonzini
2025-09-13 8:08 ` [PULL 14/61] cpus: properly kick CPUs out of inner execution loop Paolo Bonzini
2025-09-13 8:08 ` [PULL 15/61] treewide: rename qemu_wait_io_event/qemu_wait_io_event_common Paolo Bonzini
2025-09-13 8:08 ` [PULL 16/61] bsd-user, linux-user: introduce qemu_process_cpu_events Paolo Bonzini
2025-09-13 8:08 ` [PULL 17/61] cpus: clear exit_request in qemu_process_cpu_events Paolo Bonzini
2025-09-13 8:08 ` [PULL 18/61] accel: make all calls to qemu_process_cpu_events look the same Paolo Bonzini
2025-09-13 8:09 ` [PULL 19/61] tcg/user: do not set exit_request gratuitously Paolo Bonzini
2025-09-13 8:09 ` [PULL 20/61] ci: temporarily remove rust from Ubuntu Paolo Bonzini
2025-09-13 8:09 ` [PULL 21/61] configure: bump Meson to 1.9.0 for use with Rust Paolo Bonzini
2025-09-22 14:07 ` Peter Maydell
2025-09-22 15:14 ` Paolo Bonzini
2025-09-13 8:09 ` [PULL 22/61] meson, cargo: require Rust 1.83.0 Paolo Bonzini
2025-09-13 8:09 ` Paolo Bonzini [this message]
2025-09-13 8:09 ` [PULL 24/61] rust: use inline const expressions Paolo Bonzini
2025-09-13 8:09 ` [PULL 25/61] rust: add qdev Device derive macro Paolo Bonzini
2025-09-13 8:09 ` [PULL 26/61] rust: vmstate: convert to use builder pattern Paolo Bonzini
2025-09-13 8:09 ` [PULL 27/61] rust: vmstate: use const_refs_to_static Paolo Bonzini
2025-09-13 8:09 ` [PULL 28/61] rust: qdev: const_refs_to_static Paolo Bonzini
2025-09-13 8:09 ` [PULL 29/61] docs/rust: update msrv Paolo Bonzini
2025-09-13 8:09 ` [PULL 30/61] rust: remove unused global qemu "allocator" Paolo Bonzini
2025-09-13 8:09 ` [PULL 31/61] rust: add workspace authors Paolo Bonzini
2025-09-13 8:09 ` [PULL 32/61] rust: move vmstate_clock!() to qdev module Paolo Bonzini
2025-09-13 8:09 ` [PULL 33/61] rust: move VMState handling to QOM module Paolo Bonzini
2025-09-13 8:09 ` [PULL 34/61] rust: move Cell vmstate impl Paolo Bonzini
2025-09-13 8:09 ` [PULL 35/61] rust: split Rust-only "common" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 36/61] rust: make build.rs generic over various ./rust/projects Paolo Bonzini
2025-09-13 8:09 ` [PULL 37/61] rust: split "util" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 38/61] rust: split "migration" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 39/61] rust: split "bql" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 40/61] rust: split "qom" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 41/61] rust: split "chardev" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 42/61] rust: split "system" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 43/61] rust: split "hwcore" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 44/61] rust: rename qemu_api_macros -> qemu_macros Paolo Bonzini
2025-09-13 8:09 ` [PULL 45/61] rust/hpet: drop now unneeded qemu_api dep Paolo Bonzini
2025-09-13 8:09 ` [PULL 46/61] rust/pl011: drop dependency on qemu_api Paolo Bonzini
2025-09-13 8:09 ` [PULL 47/61] rust: repurpose qemu_api -> tests Paolo Bonzini
2025-09-13 8:09 ` [PULL 48/61] rust: re-export qemu_macros internal helper in "bits" Paolo Bonzini
2025-09-13 8:09 ` [PULL 49/61] rust: re-export qemu macros from common/qom/hwcore Paolo Bonzini
2025-09-13 8:09 ` [PULL 50/61] docs: update rust.rst Paolo Bonzini
2025-09-13 8:09 ` [PULL 51/61] rust: meson: remove unnecessary complication in device crates Paolo Bonzini
2025-09-13 8:09 ` [PULL 52/61] rust: do not inline do_init_io Paolo Bonzini
2025-09-13 8:09 ` [PULL 53/61] hpet: guard IRQ handling with BQL Paolo Bonzini
2025-09-13 8:09 ` [PULL 54/61] i386/cpu: Enable SMM cpu address space under KVM Paolo Bonzini
2025-09-18 16:24 ` Michael Tokarev
2025-09-22 15:16 ` Paolo Bonzini
2025-09-26 17:48 ` Peter Maydell
2025-09-28 6:51 ` Xiaoyao Li
2025-09-13 8:09 ` [PULL 55/61] target/i386: Define enum X86ASIdx for x86's address spaces Paolo Bonzini
2025-09-13 8:09 ` [PULL 56/61] multiboot: Fix the split lock Paolo Bonzini
2025-09-13 8:09 ` [PULL 57/61] i386/kvm: Get X86MachineState in kvm_arch_init() without the cast check Paolo Bonzini
2025-09-13 8:09 ` [PULL 58/61] i386/kvm: Drop KVM_CAP_X86_SMM check in kvm_arch_init() Paolo Bonzini
2025-09-13 8:09 ` [PULL 59/61] accel/kvm: Switch to check KVM_CAP_GUEST_MEMFD and KVM_CAP_USER_MEMORY2 on VM Paolo Bonzini
2025-09-13 8:09 ` [PULL 60/61] accel/kvm: Zero out mem explicitly in kvm_set_user_memory_region() Paolo Bonzini
2025-09-13 8:09 ` [PULL 61/61] accel/kvm: Set guest_memfd_offset to non-zero value only when guest_memfd is valid Paolo Bonzini
2025-09-13 9:37 ` [PULL 00/61] CPU, Rust, x86 changes for 2025-09-13 Peter Maydell
2025-09-16 14:37 ` Peter Maydell
2025-09-16 14:53 ` Paolo Bonzini
2025-09-17 16:33 ` Richard Henderson
2025-09-18 12:38 ` Xiaoyao Li
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=20250913080943.11710-24-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zhao1.liu@intel.com \
/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).