From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 95348CCD1BE for ; Thu, 23 Oct 2025 13:56:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBvnX-0004f3-4n; Thu, 23 Oct 2025 09:56:11 -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 1vBvnU-0004bw-Cu for qemu-rust@nongnu.org; Thu, 23 Oct 2025 09:56:09 -0400 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 1vBvnQ-0005E0-Pt for qemu-rust@nongnu.org; Thu, 23 Oct 2025 09:56:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761227762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N5buUGn4k9DX+q2F1RhrNr2ZKOcfJSYeoiQxFdqNeag=; b=OFB8RDWu7ft+ISy/xgmnIGGF3fcCzugg3wIWepff7CHF0ygqO56WX+v6JT2Rn1e8b1TYtG TP76JFAJu5DuK/ZMj9IdgTj+S4MYRsb3OuZ5dTqbDHHZ4Km5HiskDkcIsGTjMWqVRVEOhj 964R/R97OIDtKXGTCi5VAG14hc6fiKw= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-116-Nls2HaOIPTqnBE1hPsRtjg-1; Thu, 23 Oct 2025 09:54:21 -0400 X-MC-Unique: Nls2HaOIPTqnBE1hPsRtjg-1 X-Mimecast-MFC-AGG-ID: Nls2HaOIPTqnBE1hPsRtjg_1761227660 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-42700160169so750961f8f.1 for ; Thu, 23 Oct 2025 06:54:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761227660; x=1761832460; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N5buUGn4k9DX+q2F1RhrNr2ZKOcfJSYeoiQxFdqNeag=; b=akeKxxSA+gdMnbk2+NCz09sQGsWCCmsMO5rzWcC87+H3r7W5YPdAkH0t3VhmNCvujA PEQsnLKNAcIAAdOf3Dw63oklBnw8hime0Bp6oY3Z2Ykq3pnwDHwZECn9sKgwX2DzlpLm vQY/Lhkt8/TWkkHPbI17lBLsnkJtoHVhwYOxR1U7aPqaQyVylJVlZaBIAN4XJfVGDIvR dndA/ck9lJ4j6WLbTUjF1FNA2CLPHEwCLL47qk2Igr8cCB2Bk+gzAQXkX0Rtk5H534UK BHmAwuVzzRt5Xc5HN6iCVIlo/uupIb+XilFZ30s08sWC7TeQsGnTjA4svlXjbPljusnE j6JA== X-Forwarded-Encrypted: i=1; AJvYcCUBQXbNUwvDQctpjjdEnXHnit3g0kbTR+cMYRoEbfkf94MOWmXwxw1i6oPbR3+dvpeAPCf7BittIOs=@nongnu.org X-Gm-Message-State: AOJu0Yxu5qCTSYvu2p6Jtmzo70JgWDBWDMuDjePFxS8zXCnJWsoJ3283 nl1mDLE+wAetHFVhRVkzSJ+C/Ff0dVQmJfX3AoYhqeknH6rvIh3zMg9tCZifpQUVYkM/QW2pvNu EEgSV5xvDreEJ1/WbkQdZyDtM2LZcN0BGuBV+4ZnDyUJHiOZ+CHgI1z68GtDvOIQ= X-Gm-Gg: ASbGncvadmVUGYDP+cLZTs/TazaMFjV0EWhYOVkHNHizW6Z7arYghp76kT7dn2trhhf gwX5LXSs3a/L7Q45kds7qym1w+YnSDd/VOVUKC/WKwMo17uxplzIUX8nJKY6Ifz38XsZ2QPOGad bbXPczUN7w+Dc/VeF5Z4+X5vlFA+Gae68RDNzKcIFQ6ODvip66oGGaAoMakd0Zb2dMrt4f0ef6M ThJrKbAmo5ExJ+4/CuUzY/CJ/EljqR/+ye4zuCgUhwAAqXvyZdpo7mYs9SzyrpzOgkwqwu5d7zQ ZIOBbspuIoQig5gbeelL10j8rp4eWGxbt0IrPbu9dPIPHDXL6XpkmgSRnbJB+WRr1woK/DI5lrJ btz0nN9BH X-Received: by 2002:a05:6000:3101:b0:429:58f:325 with SMTP id ffacd0b85a97d-429058f036bmr2848311f8f.24.1761227659680; Thu, 23 Oct 2025 06:54:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFejbUlPbzCH3uCz+ZgnJK5kXySxpIVtgcMvDzvRZHLG6XILZgP8tgn3JIe0coLBlL38iMvFg== X-Received: by 2002:a05:6000:3101:b0:429:58f:325 with SMTP id ffacd0b85a97d-429058f036bmr2848286f8f.24.1761227659196; Thu, 23 Oct 2025 06:54:19 -0700 (PDT) Received: from wheatley.localdomain ([85.93.96.130]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429898ccd88sm5005195f8f.36.2025.10.23.06.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Oct 2025 06:54:18 -0700 (PDT) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 6B063DC7C867; Thu, 23 Oct 2025 15:54:18 +0200 (CEST) From: Martin Kletzander To: 'Manos Pitsidianakis ' , qemu-rust@nongnu.org, qemu-devel@nongnu.org Subject: [RFC PATCH 1/2] rust: Make common::Wrapper work with non-tuple structs as well Date: Thu, 23 Oct 2025 15:54:08 +0200 Message-ID: X-Mailer: git-send-email 2.51.0 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: OThF6PZ4qxDqBEWikq5y7ZhG0RqvejLmNgvvUbc8qG4_1761227660 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Received-SPF: pass client-ip=170.10.129.124; envelope-from=mkletzan@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-rust@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: QEMU Rust-related patches and discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-rust-bounces+qemu-rust=archiver.kernel.org@nongnu.org Sender: qemu-rust-bounces+qemu-rust=archiver.kernel.org@nongnu.org From: Martin Kletzander Signed-off-by: Martin Kletzander --- rust/qemu-macros/src/lib.rs | 49 ++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/rust/qemu-macros/src/lib.rs b/rust/qemu-macros/src/lib.rs index 50239f228be2..074ba2189eec 100644 --- a/rust/qemu-macros/src/lib.rs +++ b/rust/qemu-macros/src/lib.rs @@ -10,8 +10,8 @@ punctuated::Punctuated, spanned::Spanned, token::Comma, - Attribute, Data, DeriveInput, Error, Field, Fields, FieldsUnnamed, Ident, Meta, Path, Token, - Variant, + Attribute, Data, DeriveInput, Error, Field, Fields, FieldsNamed, + FieldsUnnamed, Ident, Index, Member, Meta, Path, Token, Type, Variant, }; mod bits; @@ -42,26 +42,52 @@ fn get_fields<'a>( Ok(&fs.named) } -fn get_unnamed_field<'a>(input: &'a DeriveInput, msg: &str) -> Result<&'a Field, Error> { +fn get_wrapped_field<'a>(input: &'a DeriveInput, msg: &str) -> Result<(Member, &'a Type), Error> { let Data::Struct(ref s) = &input.data else { return Err(Error::new( input.ident.span(), format!("Struct required for {msg}"), )); }; - let Fields::Unnamed(FieldsUnnamed { ref unnamed, .. }) = &s.fields else { + if let Fields::Unnamed(FieldsUnnamed { ref unnamed, .. }) = &s.fields { + if unnamed.len() != 1 { + return Err(Error::new( + s.fields.span(), + format!("A single field is required for {msg}"), + )); + } + return Ok((Member::Unnamed(Index::from(0)), &unnamed[0].ty)); + } + + let Fields::Named(FieldsNamed { ref named, .. }) = &s.fields else { return Err(Error::new( s.fields.span(), - format!("Tuple struct required for {msg}"), + format!("A tuple struct or a single field named 'inner' is required for {msg}"), )); }; - if unnamed.len() != 1 { + + if named.len() != 1 { return Err(Error::new( s.fields.span(), format!("A single field is required for {msg}"), )); } - Ok(&unnamed[0]) + + if let Field{ ident: Some(ref ident), .. } = named[0] { + if ident != "inner" { + return Err(Error::new( + ident.span(), + format!("The only field must be named 'inner': {msg}"), + )); + } + + return Ok((Member::Named(ident.clone()), &named[0].ty)) + } + + Err(Error::new( + s.fields.span(), + format!("A single field struct is requried for {msg}"), + )) } fn is_c_repr(input: &DeriveInput, msg: &str) -> Result<(), Error> { @@ -129,8 +155,7 @@ fn derive_opaque_or_error(input: DeriveInput) -> Result(ptr: *mut ::Wrappe } pub const fn as_mut_ptr(&self) -> *mut ::Wrapped { - self.0.as_mut_ptr() + self.#member.as_mut_ptr() } pub const fn as_ptr(&self) -> *const ::Wrapped { - self.0.as_ptr() + self.#member.as_ptr() } pub const fn as_void_ptr(&self) -> *mut ::core::ffi::c_void { - self.0.as_void_ptr() + self.#member.as_void_ptr() } pub const fn raw_get(slot: *mut Self) -> *mut ::Wrapped { -- 2.51.0