From nobody Mon Feb 9 23:07:25 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746436051; cv=none; d=zohomail.com; s=zohoarc; b=QJZY6cfCtEQC1IAKJnqVs9haZLKr3/4p+a0wAzX+5327KxhZRs8aB7sFUr52Xi8maPKfYEioin0cnZ3tZ3+NqbPNnHJ13BLApjW5MHv4RK0UrgGw1CC0vA+lMS415Dvset49zy56UI8/cU901KBQ6/Z1m3VeDMD/zKL/qQD4K8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746436051; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=id8u6QhmytdWjNgsDYLCFHIvJVm+T0ExWvUr0aO33CQ=; b=ffTi97+QlY+l6rk5WlaaEz7d+NXQfRkP5jH2AKStDHeUnupUGAnPHl9qFoNoI0uvi1TgQPMWVVGpBSyvOoNZsE9TIWwE3IvZUwbTNGbhzx3AeaCIHSTMgyUE3YPv46/2AoXGGPTnAqSj7fFZjIKu+wjpaHIbWO4Yu/Aa3mdAh+Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746436051049835.0404642755171; Mon, 5 May 2025 02:07:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBrmV-0005PA-FN; Mon, 05 May 2025 05:06:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uBrl6-0003dy-Im for qemu-devel@nongnu.org; Mon, 05 May 2025 05:05:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uBrl2-0005p3-GJ for qemu-devel@nongnu.org; Mon, 05 May 2025 05:05:06 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-486-vM7LPIIYNne8SujqCdsUVQ-1; Mon, 05 May 2025 05:05:01 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-441c122fa56so6323165e9.2 for ; Mon, 05 May 2025 02:05:01 -0700 (PDT) Received: from [192.168.10.48] ([151.95.54.106]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89cc441sm128821855e9.3.2025.05.05.02.04.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 02:04:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746435903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=id8u6QhmytdWjNgsDYLCFHIvJVm+T0ExWvUr0aO33CQ=; b=Btqz8KiE19pvuZhRUTsmI2ASthOgQSstntMI0nmGbcqrXapaAJuSmcSuzNUK22xHnLj9vt J6ho6mjxf3momueq3a6cHbOrIgVdQisVj1JY4UR8cdvUOUs+g3dCIKvvL2B38qsD+T5tFg 14MAQEk/U6+4BxsBDM2tAfc8Z3HWWcs= X-MC-Unique: vM7LPIIYNne8SujqCdsUVQ-1 X-Mimecast-MFC-AGG-ID: vM7LPIIYNne8SujqCdsUVQ_1746435900 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746435899; x=1747040699; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=id8u6QhmytdWjNgsDYLCFHIvJVm+T0ExWvUr0aO33CQ=; b=S2edQJNVeGZsTTlH+N+nJqU2cqoIeF323G6k40CQ/bbqKU3WaM3vMIbK+7DW2MizYB Ih1LkOyyN6z3DZ86nZZvNXSIb9PIyawYZBk0aApeHtHN0ocT4RgJe0x9xrXKEHFyqMAP XuCsQMFE+whQ91o/rz86PF78kZuafpfAxk/8AIEOFuMWCyioujhgcbEyaXoF7vrbsrrh NqTDJjbeluNfSPmOxZcLZDcK+FmdJp+iTGl9ySaGz6Fhof4XsoXH0TW9znoji22ZQ38L yL+ENyLqdfxx8Rq/6/+o1gCjK4y50d5pyxCfGJpdPoWile0cy6oc+31WQkcDhadvoyTG /Tmw== X-Gm-Message-State: AOJu0YzhJDCHnL/TTxaIeaIVLqr7LTi4AOTfYuE8Gn1k1pd4iI3LMl/H KCD1q6a5ndoUBottX19+3MexZnUcOZ/CBZXKgWa9WZGq8TnGCbI6lkBWyBWzSx0GvQoFwS/+GQa v+7f43bWkyJIA3uXh5+br9m7si6KqY1s1QecAUERLj5xWElyv6nUsdPXmJxenrR+oSJgIEvm/m0 l85+zsQnbpKMhVIbbVaY8UCllqtMaGP61Ihodl X-Gm-Gg: ASbGnct/SBDijd8ynpqwQjZmqWEB4Ems5nM+VOAq0GBKhLNwttqioJr+JK/Pg6wIt7A x0E88szkfdeOGFaeM/xLYzBbLPC+JbyHFoeigbUqQMAPsCAI0UzI+0mMMrmVCGmGWnWx9vKjaFK Hyeq0+K7bBtAcMCAJpaR6LA9OCOSMyCbK0Cu1+lSjR/M29OFGXMx20D90HHomHyjQwoyJxWtiBK iVOBsnncZeMnxoYPq+vmuBevOdp/j6CKS+tOIX5xWE15UtPZRlqv5ii3OdCIOjuqE87LnzyvdCg Bdjr61E4xOO/eTE= X-Received: by 2002:a05:600c:4f4b:b0:440:67f8:7589 with SMTP id 5b1f17b1804b1-441c1cfc6c8mr71133245e9.16.1746435899448; Mon, 05 May 2025 02:04:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFJ6NOxdsH59R7JFTF2kUdGip0Iis2Q67GL5v7Psp95zL1DwgV1RUtFu6Osg0DlYadflkPw5Q== X-Received: by 2002:a05:600c:4f4b:b0:440:67f8:7589 with SMTP id 5b1f17b1804b1-441c1cfc6c8mr71132845e9.16.1746435898986; Mon, 05 May 2025 02:04:58 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: manos.pitsidianakis@linaro.org, qemu-rust@nongnu.org Subject: [PATCH 08/11] rust: enable clippy::ptr_cast_constness Date: Mon, 5 May 2025 11:04:33 +0200 Message-ID: <20250505090438.24992-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250505090438.24992-1-pbonzini@redhat.com> References: <20250505090438.24992-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.411, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1746436052721116600 Content-Type: text/plain; charset="utf-8" Reviewed-by: Manos Pitsidianakis Signed-off-by: Paolo Bonzini Reviewed-by: Zhao Liu --- docs/devel/rust.rst | 2 -- rust/Cargo.toml | 2 +- rust/hw/timer/hpet/src/hpet.rs | 2 +- rust/qemu-api/src/cell.rs | 2 +- rust/qemu-api/src/chardev.rs | 2 +- rust/qemu-api/src/qom.rs | 4 ++-- rust/qemu-api/src/timer.rs | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/devel/rust.rst b/docs/devel/rust.rst index 13a002cfe69..a315f668865 100644 --- a/docs/devel/rust.rst +++ b/docs/devel/rust.rst @@ -74,8 +74,6 @@ Supported tools QEMU supports rustc version 1.63.0 and newer. Notably, the following feat= ures are missing: =20 -* ``cast_mut()``/``cast_const()`` (1.65.0). Use ``as`` instead. - * Generic Associated Types (1.65.0) =20 * ``CStr::from_bytes_with_nul()`` as a ``const`` function (1.72.0). diff --git a/rust/Cargo.toml b/rust/Cargo.toml index eda7980b31a..a328634d949 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -71,6 +71,7 @@ no_effect_underscore_binding =3D "deny" option_option =3D "deny" or_fun_call =3D "deny" ptr_as_ptr =3D "deny" +ptr_cast_constness =3D "deny" pub_underscore_fields =3D "deny" redundant_clone =3D "deny" redundant_closure_for_method_calls =3D "deny" @@ -92,7 +93,6 @@ used_underscore_binding =3D "deny" =20 # nice to have, but cannot be enabled yet #wildcard_imports =3D "deny" # still have many bindings::* imports -#ptr_cast_constness =3D "deny" # needs 1.65.0 for cast_mut()/cast_const() =20 # these may have false positives #option_if_let_else =3D "deny" diff --git a/rust/hw/timer/hpet/src/hpet.rs b/rust/hw/timer/hpet/src/hpet.rs index d4364f2f2f7..b7a1be05deb 100644 --- a/rust/hw/timer/hpet/src/hpet.rs +++ b/rust/hw/timer/hpet/src/hpet.rs @@ -219,7 +219,7 @@ fn init(&mut self, index: u8, state: &HPETState) { // SAFETY: the HPETTimer will only be used after the timer // is initialized below. qemu_timer: unsafe { Timer::new() }, - state: NonNull::new(state as *const _ as *mut _).unwrap(), + state: NonNull::new((state as *const HPETState).cast_mut()).un= wrap(), config: 0, cmp: 0, fsb: 0, diff --git a/rust/qemu-api/src/cell.rs b/rust/qemu-api/src/cell.rs index ab0785a2692..1cb9fdcd53f 100644 --- a/rust/qemu-api/src/cell.rs +++ b/rust/qemu-api/src/cell.rs @@ -1016,7 +1016,7 @@ pub const fn as_mut_ptr(&self) -> *mut T { =20 /// Returns a raw pointer to the opaque data. pub const fn as_ptr(&self) -> *const T { - self.as_mut_ptr() as *const _ + self.as_mut_ptr().cast_const() } =20 /// Returns a raw pointer to the opaque data that can be passed to a diff --git a/rust/qemu-api/src/chardev.rs b/rust/qemu-api/src/chardev.rs index 146a4852da3..6e0590d758e 100644 --- a/rust/qemu-api/src/chardev.rs +++ b/rust/qemu-api/src/chardev.rs @@ -160,7 +160,7 @@ pub fn enable_handlers< receive_cb, event_cb, None, - (owner as *const T as *mut T).cast::(), + (owner as *const T).cast_mut().cast::(), core::ptr::null_mut(), true, ); diff --git a/rust/qemu-api/src/qom.rs b/rust/qemu-api/src/qom.rs index 52e3a1ec981..41e5a5e29a8 100644 --- a/rust/qemu-api/src/qom.rs +++ b/rust/qemu-api/src/qom.rs @@ -388,7 +388,7 @@ fn as_mut_ptr(&self) -> *mut U { #[allow(clippy::as_ptr_cast_mut)] { - self.as_ptr::() as *mut _ + self.as_ptr::().cast_mut() } } } @@ -638,7 +638,7 @@ pub unsafe fn from_raw(ptr: *const T) -> Self { // SAFETY NOTE: while NonNull requires a mutable pointer, only // Deref is implemented so the pointer passed to from_raw // remains const - Owned(NonNull::new(ptr as *mut T).unwrap()) + Owned(NonNull::new(ptr.cast_mut()).unwrap()) } =20 /// Obtain a raw C pointer from a reference. `src` is consumed diff --git a/rust/qemu-api/src/timer.rs b/rust/qemu-api/src/timer.rs index d697fd742bc..868bd88575f 100644 --- a/rust/qemu-api/src/timer.rs +++ b/rust/qemu-api/src/timer.rs @@ -81,7 +81,7 @@ pub fn init_full<'timer, 'opaque: 'timer, T, F>( scale as c_int, attributes as c_int, Some(timer_cb), - (opaque as *const T).cast::() as *mut c_void, + (opaque as *const T).cast::().cast_mut(), ) } } --=20 2.49.0