From nobody Sat Nov 23 21:49:36 2024 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1730741303; cv=none; d=zohomail.com; s=zohoarc; b=cobncsb78b4CyQWYrDqAmdXpoNF/V3NXVivjoEAnduP++NbAOLZ0cxlBkDG0vNxPDcDMvqI71n12ltlyHU7R0I6eQP3YMHJMDTKaKI78mjdaAJO7RHXxiUDUajSxfZB02yFUws18qPVPBS+XA34QoI7YdZwsI2fjhao2+F5u0wg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730741303; 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=A9+GxjZBE101yDjjA0Qt1X0NpiGdJaUq+zHWXHIOAas=; b=JQbbm+1k1HZCLLCKZtHw3QiU2SIbbzRDgLQUlYNrSfC+uUN39YuytfkiYL2fheLd0BcmxkoSp7kCyLIq1em1GoqeSynduAfYhQEHe1RS6jQMjmvTgLLhrqwQ1pk1lO6FPErU+znbGiGOy8yL+LeOGWLV6pH61EAD6UqeY7zbaHA= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730741303720327.0896442777969; Mon, 4 Nov 2024 09:28:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t80s0-0005Dv-Vn; Mon, 04 Nov 2024 12:28:05 -0500 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 1t80ry-0005Cw-SF for qemu-devel@nongnu.org; Mon, 04 Nov 2024 12:28:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t80rs-0000Fw-Hl for qemu-devel@nongnu.org; Mon, 04 Nov 2024 12:28:02 -0500 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-159-i3ccn-fhPW6Mxt2xkEjaSw-1; Mon, 04 Nov 2024 12:27:54 -0500 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43157cff1d1so33012305e9.2 for ; Mon, 04 Nov 2024 09:27:53 -0800 (PST) Received: from [192.168.10.3] ([151.49.226.83]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-431bd8e8466sm190429555e9.2.2024.11.04.09.27.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 09:27:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730741275; 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=A9+GxjZBE101yDjjA0Qt1X0NpiGdJaUq+zHWXHIOAas=; b=G9fzXmuHaKOhZtbXcKgYs/WNKntcLRDjDIL4ghNtqGCL+329xsT3K6wV6oRQbob/CMELiC kXTozOg350RI2H7YbpOhJ6TqT/VHpkv024Q8/M6pK01/m7RSDsICXcJJxnwMGbdBkLynYJ nagRLHFRA17SFYjJb8Lb6woFuAFkTOg= X-MC-Unique: i3ccn-fhPW6Mxt2xkEjaSw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730741272; x=1731346072; 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=A9+GxjZBE101yDjjA0Qt1X0NpiGdJaUq+zHWXHIOAas=; b=WO98hqJTp9JmSwWNl7TuG4693nSsLPJ31I9dtMXG0LHnBuMFdd8nmKAwaSixLfGVaX ejtAtHhKJfAKwNXGb650TPgUTVnFpMxuLOr88QgzbBitlSdX7UZ64olx3j4ifuFXyBvR kSgMGBuMx1zVbvkImyOV3b5Ax2QhpVWpdtGGAIAQ/Kids5QNdX0TjRml4tM1ZDbETRTA SjtbSL/HxQR68BSiJqDnWesXl4eUOtZWcpsFKg6F/VL37m6SRCDgCp2NpUhuwDU2OoIt 8Q28NUawhonUIt3GCBb/TvMwAajY+gK+PqEE5sjvtgWr/XRpdhCDrsxNxbsk78+whNZF T5wQ== X-Gm-Message-State: AOJu0YyEFC73lCDwWY+VAfrczlb/nV8rP3E+ayW1Y7n3wVNiHgvgpfs2 ApXW2uN6THoNJn4pxi/q8QuMBEYs8CfL+4z0nfM4OVldfYibjaI80BmVhs4Kowa3a7aAY0zILVM i05iPD8KDjqGmj/vOMcXbBE09/wE+WxVaRyqeLy04lcroB/bYOLkcDrQ82pDLFs5g6NYj03+qz9 K+w0ChOtXU4MfDecT2DSEGZog8qMrnHP3crcejq4E= X-Received: by 2002:a05:600c:1396:b0:430:582f:3a9d with SMTP id 5b1f17b1804b1-4327b80d1a9mr152247555e9.26.1730741272065; Mon, 04 Nov 2024 09:27:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IG7hmlApj1LQZ4Rj7bpAn4i0fx0kKZFEK8dvqvgNwd7dSLiYyfO8asezG1r2QowDbtsYp8hxw== X-Received: by 2002:a05:600c:1396:b0:430:582f:3a9d with SMTP id 5b1f17b1804b1-4327b80d1a9mr152247245e9.26.1730741271614; Mon, 04 Nov 2024 09:27:51 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Junjie Mao , Kevin Wolf , Manos Pitsidianakis , Pierrick Bouvier , Zhao Liu Subject: [PULL 13/40] rust: cleanup module_init!, use it from #[derive(Object)] Date: Mon, 4 Nov 2024 18:26:52 +0100 Message-ID: <20241104172721.180255-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241104172721.180255-1-pbonzini@redhat.com> References: <20241104172721.180255-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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.34, 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_VALIDITY_CERTIFIED_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: 1730741305556116600 Content-Type: text/plain; charset="utf-8" Remove the duplicate code by using the module_init! macro; at the same time, simplify how module_init! is used, by taking inspiration from the implement= ation of #[derive(Object)]. Reviewed-by: Junjie Mao Reviewed-by: Kevin Wolf Signed-off-by: Paolo Bonzini --- rust/qemu-api-macros/src/lib.rs | 33 +++------------- rust/qemu-api/src/definitions.rs | 65 +++++++++++++------------------- 2 files changed, 32 insertions(+), 66 deletions(-) diff --git a/rust/qemu-api-macros/src/lib.rs b/rust/qemu-api-macros/src/lib= .rs index 70e3f920460..a4bc5d01ee8 100644 --- a/rust/qemu-api-macros/src/lib.rs +++ b/rust/qemu-api-macros/src/lib.rs @@ -3,43 +3,20 @@ // SPDX-License-Identifier: GPL-2.0-or-later =20 use proc_macro::TokenStream; -use quote::{format_ident, quote}; +use quote::quote; use syn::{parse_macro_input, DeriveInput}; =20 #[proc_macro_derive(Object)] pub fn derive_object(input: TokenStream) -> TokenStream { let input =3D parse_macro_input!(input as DeriveInput); - let name =3D input.ident; - let module_static =3D format_ident!("__{}_LOAD_MODULE", name); =20 let expanded =3D quote! { - #[allow(non_upper_case_globals)] - #[used] - #[cfg_attr( - not(any(target_vendor =3D "apple", target_os =3D "windows")), - link_section =3D ".init_array" - )] - #[cfg_attr(target_vendor =3D "apple", link_section =3D "__DATA,__m= od_init_func")] - #[cfg_attr(target_os =3D "windows", link_section =3D ".CRT$XCU")] - pub static #module_static: extern "C" fn() =3D { - extern "C" fn __register() { - unsafe { - ::qemu_api::bindings::type_register_static(&<#name as = ::qemu_api::definitions::ObjectImpl>::TYPE_INFO); - } + ::qemu_api::module_init! { + MODULE_INIT_QOM =3D> unsafe { + ::qemu_api::bindings::type_register_static(&<#name as ::qe= mu_api::definitions::ObjectImpl>::TYPE_INFO); } - - extern "C" fn __load() { - unsafe { - ::qemu_api::bindings::register_module_init( - Some(__register), - ::qemu_api::bindings::module_init_type::MODULE_INI= T_QOM - ); - } - } - - __load - }; + } }; =20 TokenStream::from(expanded) diff --git a/rust/qemu-api/src/definitions.rs b/rust/qemu-api/src/definitio= ns.rs index 3323a665d92..064afe60549 100644 --- a/rust/qemu-api/src/definitions.rs +++ b/rust/qemu-api/src/definitions.rs @@ -29,51 +29,40 @@ pub trait Class { =20 #[macro_export] macro_rules! module_init { - ($func:expr, $type:expr) =3D> { - #[used] - #[cfg_attr( - not(any(target_vendor =3D "apple", target_os =3D "windows")), - link_section =3D ".init_array" - )] - #[cfg_attr(target_vendor =3D "apple", link_section =3D "__DATA,__m= od_init_func")] - #[cfg_attr(target_os =3D "windows", link_section =3D ".CRT$XCU")] - pub static LOAD_MODULE: extern "C" fn() =3D { - extern "C" fn __load() { - unsafe { - $crate::bindings::register_module_init(Some($func), $t= ype); - } - } - - __load - }; - }; - (qom: $func:ident =3D> $body:block) =3D> { - // NOTE: To have custom identifiers for the ctor func we need to e= ither supply - // them directly as a macro argument or create them with a proc ma= cro. - #[used] - #[cfg_attr( - not(any(target_vendor =3D "apple", target_os =3D "windows")), - link_section =3D ".init_array" - )] - #[cfg_attr(target_vendor =3D "apple", link_section =3D "__DATA,__m= od_init_func")] - #[cfg_attr(target_os =3D "windows", link_section =3D ".CRT$XCU")] - pub static LOAD_MODULE: extern "C" fn() =3D { - extern "C" fn __load() { - unsafe extern "C" fn $func() { + ($type:ident =3D> $body:block) =3D> { + const _: () =3D { + #[used] + #[cfg_attr( + not(any(target_vendor =3D "apple", target_os =3D "windows"= )), + link_section =3D ".init_array" + )] + #[cfg_attr(target_vendor =3D "apple", link_section =3D "__DATA= ,__mod_init_func")] + #[cfg_attr(target_os =3D "windows", link_section =3D ".CRT$XCU= ")] + pub static LOAD_MODULE: extern "C" fn() =3D { + extern "C" fn init_fn() { $body } =20 - unsafe { - $crate::bindings::register_module_init( - Some($func), - $crate::bindings::module_init_type::MODULE_INIT_QO= M, - ); + extern "C" fn ctor_fn() { + unsafe { + $crate::bindings::register_module_init( + Some(init_fn), + $crate::bindings::module_init_type::$type, + ); + } } - } =20 - __load + ctor_fn + }; }; }; + + // shortcut because it's quite common that $body needs unsafe {} + ($type:ident =3D> unsafe $body:block) =3D> { + $crate::module_init! { + $type =3D> { unsafe { $body } } + } + }; } =20 #[macro_export] --=20 2.47.0