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 1B15FCCA476 for ; Fri, 10 Oct 2025 15:16:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7Elf-0008Tb-OZ; Fri, 10 Oct 2025 11:10:51 -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 1v7Eld-0008Sn-LK for qemu-devel@nongnu.org; Fri, 10 Oct 2025 11:10:49 -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 1v7ElK-00044m-LU for qemu-devel@nongnu.org; Fri, 10 Oct 2025 11:10:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760109024; 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=YRsSx/btzTva/S/q1QVS/AopDr2/0oXgK2m/mbc40QU=; b=IFEuZdoMf68LItVyNbMEWVejFqxqwkPnW0ZVoX+DqDnZJCvy6GgJuNnxAgd2KZBfc1YdAp /AzS9Wd4UQK/68PMymalr6BiTyj5K8N8yYbo5crCj/autNloQbvlTST0I9oHURGz0nmEXx 2e5OIL6rG+zUbXeIhlqHfsooqs07Cyk= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-551-DllfT2oiOpis5AWMYXhOSQ-1; Fri, 10 Oct 2025 11:10:23 -0400 X-MC-Unique: DllfT2oiOpis5AWMYXhOSQ-1 X-Mimecast-MFC-AGG-ID: DllfT2oiOpis5AWMYXhOSQ_1760109021 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-b41c67edce5so322346066b.3 for ; Fri, 10 Oct 2025 08:10:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760109020; x=1760713820; 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=YRsSx/btzTva/S/q1QVS/AopDr2/0oXgK2m/mbc40QU=; b=wDpojkEWNlGtVuS+Q4PaeALUEWiws1gEgU5mflDw1e5+fWuJjgeSFS7MJ8TIxwNlSE TIHypNTNVn/BdD1BwLMVedef3I1jkO0lvb4tZleGv7z7H5U70wh4xPzVs7S/lpw7iqKI yeucPqICVd1LIjSflw9d9ccpzmT/y20Gpju1+9gpM5HeGouICia74GOGyZ5zr48ekLB6 fO86eXQNK+n2RGMOvptmLqAZ8TEoWWeAWurRu80hxaKyXLw1q6dnsiRf0I2guxLoAesn ZDQiWLEfkm9xyVq/0VtOXIPBwRs1SgFdjw99hOqwAqgkLKVinXbrGKSPMsoI398vsut4 5P3Q== X-Gm-Message-State: AOJu0Yyr0EDSyrKyHRav5lwrj7VoyNNknkbqzKUI4hqRiTioe2N7BOsY RXXCwwkJdGc2js0B+llucyybzXpJEDVP6yoN5IQYWoNVUPyXXJSDDPm3ZG6BK2bulGTLyqEmhHH ossCpWMPYWmmtmYvJtY7OJGjK4jEYw/B6/geoAX3KaH2CjAue40ydC4nppQhVkZOvStAjTUtyZV 8xwsuaFfGLcTmDwkuVVh5RdE9AiGnaHJXk/iO8dt9F X-Gm-Gg: ASbGncu99hscZcwt/FqzVmyVJ8GU0ZMbPipuX4z4atqhgTT6jwLPo/LEvG59ullY0ZG BkaRHJh0+7unM5DjueXua972swBpwloVgBHuYorUWcuw1EyDnuKyFbiIFJJGVgJURabQPx17jV6 xyJSjx/DmWtFzwFWy9oSoUON6wb44OCcGnppPJIVvmHf3VhAPvq2g0DfpXOakEmTjqDHEdIWpZ3 fZNwkeNXdotFHd0Ys2zy9SqASBya9Yk3RAIERmkvOWbkqs872oraEuBXrvOsB13aw5+r5v6g4YC q6VGySiPs2geProH15tZ3FIs3OuRZq5uveXal4CDhNZh/1lJpgW1IV5kXn8nVmgfEqzHjPEwSsM e3ci5tXeknal5PGmzHXjtFBLYUQ7F3J8fA4uBfISkqp5s X-Received: by 2002:a17:907:c28:b0:b46:3f98:6ba5 with SMTP id a640c23a62f3a-b50aa48e3a6mr1435870466b.11.1760109019757; Fri, 10 Oct 2025 08:10:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEuQl6W1MulL3xWbAIO+JpGNItc70G29j6vMIZ+9VFy+pU1+CdSagjJdMcCIvSM3J/0YoskOQ== X-Received: by 2002:a17:907:c28:b0:b46:3f98:6ba5 with SMTP id a640c23a62f3a-b50aa48e3a6mr1435866866b.11.1760109019260; Fri, 10 Oct 2025 08:10:19 -0700 (PDT) Received: from [192.168.10.48] ([151.49.231.162]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b55d5cad80bsm252171666b.16.2025.10.10.08.10.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Oct 2025 08:10:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, marcandre.lureau@redhat.com, qemu-rust@nongnu.org Subject: [PATCH 05/19] subprojects: add serde Date: Fri, 10 Oct 2025 17:09:50 +0200 Message-ID: <20251010151006.791038-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251010151006.791038-1-pbonzini@redhat.com> References: <20251010151006.791038-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.441, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Paolo Bonzini --- rust/Cargo.toml | 2 ++ rust/meson.build | 4 +++ scripts/archive-source.sh | 3 ++ scripts/make-release | 2 +- subprojects/.gitignore | 3 ++ .../packagefiles/serde-1-rs/meson.build | 36 +++++++++++++++++++ .../packagefiles/serde-1.0.226-include.patch | 16 +++++++++ .../packagefiles/serde_core-1-rs/meson.build | 25 +++++++++++++ .../serde_core-1.0.226-include.patch | 15 ++++++++ .../serde_derive-1-rs/meson.build | 35 ++++++++++++++++++ .../serde_derive-1.0.226-include.patch | 11 ++++++ subprojects/serde-1-rs.wrap | 11 ++++++ subprojects/serde_core-1-rs.wrap | 11 ++++++ subprojects/serde_derive-1-rs.wrap | 11 ++++++ 14 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 subprojects/packagefiles/serde-1-rs/meson.build create mode 100644 subprojects/packagefiles/serde-1.0.226-include.patch create mode 100644 subprojects/packagefiles/serde_core-1-rs/meson.build create mode 100644 subprojects/packagefiles/serde_core-1.0.226-include.patch create mode 100644 subprojects/packagefiles/serde_derive-1-rs/meson.build create mode 100644 subprojects/packagefiles/serde_derive-1.0.226-include.patch create mode 100644 subprojects/serde-1-rs.wrap create mode 100644 subprojects/serde_core-1-rs.wrap create mode 100644 subprojects/serde_derive-1-rs.wrap diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 4f98b2c03d3..76fdd9b97bf 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -30,6 +30,8 @@ anyhow = "~1.0" foreign = "~0.3.1" libc = "0.2.162" glib-sys = { version = "0.21.2", features = ["v2_66"] } +serde = "1.0.226" +serde_derive = "1.0.226" [workspace.lints.rust] unexpected_cfgs = { level = "deny", check-cfg = ['cfg(MESON)'] } diff --git a/rust/meson.build b/rust/meson.build index 6ba075c8c71..f65cc4018c2 100644 --- a/rust/meson.build +++ b/rust/meson.build @@ -4,6 +4,8 @@ subproject('bilge-impl-0.2-rs', required: true) subproject('foreign-0.3-rs', required: true) subproject('glib-sys-0.21-rs', required: true) subproject('libc-0.2-rs', required: true) +subproject('serde-1-rs', required: true) +subproject('serde_derive-1-rs', required: true) anyhow_rs = dependency('anyhow-1-rs') bilge_rs = dependency('bilge-0.2-rs') @@ -11,6 +13,8 @@ bilge_impl_rs = dependency('bilge-impl-0.2-rs') foreign_rs = dependency('foreign-0.3-rs') glib_sys_rs = dependency('glib-sys-0.21-rs') libc_rs = dependency('libc-0.2-rs') +serde_rs = dependency('serde-1-rs') +serde_derive_rs = dependency('serde_derive-1-rs', native: true) subproject('proc-macro2-1-rs', required: true) subproject('quote-1-rs', required: true) diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index 8f97b19a088..3ed0429d806 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -45,6 +45,9 @@ subprojects=( proc-macro-error-attr-1-rs proc-macro2-1-rs quote-1-rs + serde-1-rs + serde_core-1-rs + serde_derive-1-rs syn-2-rs unicode-ident-1-rs ) diff --git a/scripts/make-release b/scripts/make-release index bc1b43caa25..eb5808b83ec 100755 --- a/scripts/make-release +++ b/scripts/make-release @@ -44,7 +44,7 @@ SUBPROJECTS="libvfio-user keycodemapdb berkeley-softfloat-3 bilge-impl-0.2-rs either-1-rs foreign-0.3-rs itertools-0.11-rs libc-0.2-rs proc-macro2-1-rs proc-macro-error-1-rs proc-macro-error-attr-1-rs quote-1-rs - syn-2-rs unicode-ident-1-rs" + serde-1-rs serde_core-1-rs serde_derive-1-rs syn-2-rs unicode-ident-1-rs" src="$1" version="$2" diff --git a/subprojects/.gitignore b/subprojects/.gitignore index c00c8478372..697d1ef3bdb 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -20,6 +20,9 @@ /proc-macro-error-attr-* /proc-macro* /quote-* +/serde-* +/serde_core-* +/serde_derive-* /syn-* /unicode-ident-* diff --git a/subprojects/packagefiles/serde-1-rs/meson.build b/subprojects/packagefiles/serde-1-rs/meson.build new file mode 100644 index 00000000000..6cb2b59a147 --- /dev/null +++ b/subprojects/packagefiles/serde-1-rs/meson.build @@ -0,0 +1,36 @@ +project('serde-1-rs', 'rust', + meson_version: '>=1.5.0', + version: '1.0.226', + license: 'MIT OR Apache-2.0', + default_options: []) + +subproject('serde_core-1-rs', required: true) +subproject('serde_derive-1-rs', required: true) + +serde_core_dep = dependency('serde_core-1-rs') +serde_derive_dep = dependency('serde_derive-1-rs') + +_serde_rs = static_library( + 'serde', + files('src/lib.rs'), + gnu_symbol_visibility: 'hidden', + override_options: ['rust_std=2021', 'build.rust_std=2021'], + rust_abi: 'rust', + rust_args: [ + '--cap-lints', 'allow', + '--cfg', 'feature="alloc"', + '--cfg', 'feature="std"', + '--cfg', 'feature="derive"', + ], + dependencies: [ + serde_core_dep, + serde_derive_dep, + ] +) + +serde_dep = declare_dependency( + link_with: _serde_rs, + dependencies: serde_derive_dep, +) + +meson.override_dependency('serde-1-rs', serde_dep, native: true) diff --git a/subprojects/packagefiles/serde-1.0.226-include.patch b/subprojects/packagefiles/serde-1.0.226-include.patch new file mode 100644 index 00000000000..92878136878 --- /dev/null +++ b/subprojects/packagefiles/serde-1.0.226-include.patch @@ -0,0 +1,16 @@ +--- a/src/lib.rs 2025-09-23 13:41:09.327582205 +0200 ++++ b/src/lib.rs 2025-09-23 13:41:23.043271856 +0200 +@@ -241,7 +241,12 @@ + #[doc(hidden)] + mod private; + +-include!(concat!(env!("OUT_DIR"), "/private.rs")); ++#[doc(hidden)] ++pub mod __private_MESON { ++ #[doc(hidden)] ++ pub use crate::private::*; ++} ++use serde_core::__private_MESON as serde_core_private; + + // Re-export #[derive(Serialize, Deserialize)]. + // diff --git a/subprojects/packagefiles/serde_core-1-rs/meson.build b/subprojects/packagefiles/serde_core-1-rs/meson.build new file mode 100644 index 00000000000..e917d9337f6 --- /dev/null +++ b/subprojects/packagefiles/serde_core-1-rs/meson.build @@ -0,0 +1,25 @@ +project('serde_core-1-rs', 'rust', + meson_version: '>=1.5.0', + version: '1.0.226', + license: 'MIT OR Apache-2.0', + default_options: []) + +_serde_core_rs = static_library( + 'serde_core', + files('src/lib.rs'), + gnu_symbol_visibility: 'hidden', + override_options: ['rust_std=2021', 'build.rust_std=2021'], + rust_abi: 'rust', + rust_args: [ + '--cap-lints', 'allow', + '--cfg', 'feature="alloc"', + '--cfg', 'feature="result"', + '--cfg', 'feature="std"', + ], +) + +serde_core_dep = declare_dependency( + link_with: _serde_core_rs, +) + +meson.override_dependency('serde_core-1-rs', serde_core_dep, native: true) diff --git a/subprojects/packagefiles/serde_core-1.0.226-include.patch b/subprojects/packagefiles/serde_core-1.0.226-include.patch new file mode 100644 index 00000000000..d1321dfe272 --- /dev/null +++ b/subprojects/packagefiles/serde_core-1.0.226-include.patch @@ -0,0 +1,15 @@ +--- a/src/lib.rs 2025-09-23 13:32:40.872421170 +0200 ++++ b/src/lib.rs 2025-09-23 13:32:52.181098856 +0200 +@@ -263,7 +263,11 @@ + pub use core::result::Result; + } + +-include!(concat!(env!("OUT_DIR"), "/private.rs")); ++#[doc(hidden)] ++pub mod __private_MESON { ++ #[doc(hidden)] ++ pub use crate::private::*; ++} + + #[cfg(all(not(feature = "std"), no_core_error))] + mod std_error; diff --git a/subprojects/packagefiles/serde_derive-1-rs/meson.build b/subprojects/packagefiles/serde_derive-1-rs/meson.build new file mode 100644 index 00000000000..6c1001a844a --- /dev/null +++ b/subprojects/packagefiles/serde_derive-1-rs/meson.build @@ -0,0 +1,35 @@ +project('serde_derive-1-rs', 'rust', + meson_version: '>=1.5.0', + version: '1.0.226', + license: 'MIT OR Apache-2.0', + default_options: []) + +subproject('quote-1-rs', required: true) +subproject('syn-2-rs', required: true) +subproject('proc-macro2-1-rs', required: true) + +quote_dep = dependency('quote-1-rs', native: true) +syn_dep = dependency('syn-2-rs', native: true) +proc_macro2_dep = dependency('proc-macro2-1-rs', native: true) + +rust = import('rust') + +_serde_derive_rs = rust.proc_macro( + 'serde_derive', + files('src/lib.rs'), + override_options: ['rust_std=2021', 'build.rust_std=2021'], + rust_args: [ + '--cap-lints', 'allow', + ], + dependencies: [ + quote_dep, + syn_dep, + proc_macro2_dep, + ], +) + +serde_derive_dep = declare_dependency( + link_with: _serde_derive_rs, +) + +meson.override_dependency('serde_derive-1-rs', serde_derive_dep) diff --git a/subprojects/packagefiles/serde_derive-1.0.226-include.patch b/subprojects/packagefiles/serde_derive-1.0.226-include.patch new file mode 100644 index 00000000000..81d65564d29 --- /dev/null +++ b/subprojects/packagefiles/serde_derive-1.0.226-include.patch @@ -0,0 +1,11 @@ +--- a/src/lib.rs 2025-09-23 13:51:51.540191923 +0200 ++++ b/src/lib.rs 2025-09-23 13:52:07.690060195 +0200 +@@ -98,7 +98,7 @@ + impl private { + fn ident(&self) -> Ident { + Ident::new( +- concat!("__private", env!("CARGO_PKG_VERSION_PATCH")), ++ "__private_MESON", + Span::call_site(), + ) + } diff --git a/subprojects/serde-1-rs.wrap b/subprojects/serde-1-rs.wrap new file mode 100644 index 00000000000..56746dd0f43 --- /dev/null +++ b/subprojects/serde-1-rs.wrap @@ -0,0 +1,11 @@ +[wrap-file] +directory = serde-1.0.226 +source_url = https://crates.io/api/v1/crates/serde/1.0.226/download +source_filename = serde-1.0.226.0.tar.gz +source_hash = 0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd +#method = cargo +diff_files = serde-1.0.226-include.patch +patch_directory = serde-1-rs + +# bump this version number on every change to meson.build or the patches: +# v1 diff --git a/subprojects/serde_core-1-rs.wrap b/subprojects/serde_core-1-rs.wrap new file mode 100644 index 00000000000..3692e754935 --- /dev/null +++ b/subprojects/serde_core-1-rs.wrap @@ -0,0 +1,11 @@ +[wrap-file] +directory = serde_core-1.0.226 +source_url = https://crates.io/api/v1/crates/serde_core/1.0.226/download +source_filename = serde_core-1.0.226.0.tar.gz +source_hash = ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4 +#method = cargo +diff_files = serde_core-1.0.226-include.patch +patch_directory = serde_core-1-rs + +# bump this version number on every change to meson.build or the patches: +# v1 diff --git a/subprojects/serde_derive-1-rs.wrap b/subprojects/serde_derive-1-rs.wrap new file mode 100644 index 00000000000..00c92dc79cf --- /dev/null +++ b/subprojects/serde_derive-1-rs.wrap @@ -0,0 +1,11 @@ +[wrap-file] +directory = serde_derive-1.0.226 +source_url = https://crates.io/api/v1/crates/serde_derive/1.0.226/download +source_filename = serde_derive-1.0.226.0.tar.gz +source_hash = 8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33 +#method = cargo +diff_files = serde_derive-1.0.226-include.patch +patch_directory = serde_derive-1-rs + +# bump this version number on every change to meson.build or the patches: +# v1 -- 2.51.0