From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-rust@nongnu.org
Subject: [PATCH 3/9] rust: remove unnecessary repetitive options
Date: Thu, 27 Nov 2025 14:20:30 +0100 [thread overview]
Message-ID: <20251127132036.84384-4-pbonzini@redhat.com> (raw)
In-Reply-To: <20251127132036.84384-1-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 3 ++-
rust/bits/meson.build | 2 --
rust/bql/meson.build | 2 --
rust/chardev/meson.build | 2 --
rust/common/meson.build | 2 --
rust/migration/meson.build | 2 --
rust/qemu-macros/meson.build | 1 -
rust/qom/meson.build | 2 --
rust/system/meson.build | 2 --
rust/tests/meson.build | 1 -
rust/trace/meson.build | 2 --
rust/util/meson.build | 2 --
12 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/meson.build b/meson.build
index d9293294d8e..270181038bf 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,7 @@
project('qemu', ['c'], meson_version: '>=1.5.0',
default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=gnu++11', 'b_colorout=auto',
- 'b_staticpic=false', 'stdsplit=false', 'optimization=2', 'b_pie=true'],
+ 'b_staticpic=false', 'stdsplit=false', 'optimization=2', 'b_pie=true',
+ 'rust_std=2021', 'build.rust_std=2021'],
version: files('VERSION'))
meson.add_devenv({ 'MESON_BUILD_ROOT' : meson.project_build_root() })
diff --git a/rust/bits/meson.build b/rust/bits/meson.build
index 359ca86f155..c0094ffcf38 100644
--- a/rust/bits/meson.build
+++ b/rust/bits/meson.build
@@ -1,8 +1,6 @@
_bits_rs = static_library(
'bits',
'src/lib.rs',
- override_options: ['rust_std=2021', 'build.rust_std=2021'],
- rust_abi: 'rust',
dependencies: [qemu_macros],
)
diff --git a/rust/bql/meson.build b/rust/bql/meson.build
index 091372dd7b6..e5836e3f566 100644
--- a/rust/bql/meson.build
+++ b/rust/bql/meson.build
@@ -34,8 +34,6 @@ _bql_rs = static_library(
],
{'.': _bql_bindings_inc_rs}
),
- override_options: ['rust_std=2021', 'build.rust_std=2021'],
- rust_abi: 'rust',
rust_args: _bql_cfg,
dependencies: [glib_sys_rs],
)
diff --git a/rust/chardev/meson.build b/rust/chardev/meson.build
index 36ada7c4546..6b681c609ad 100644
--- a/rust/chardev/meson.build
+++ b/rust/chardev/meson.build
@@ -33,8 +33,6 @@ _chardev_rs = static_library(
],
{'.': _chardev_bindings_inc_rs}
),
- override_options: ['rust_std=2021', 'build.rust_std=2021'],
- rust_abi: 'rust',
link_with: [_bql_rs, _migration_rs, _qom_rs, _util_rs],
dependencies: [glib_sys_rs, common_rs, qemu_macros],
)
diff --git a/rust/common/meson.build b/rust/common/meson.build
index aff601d1df2..4b1cd35f639 100644
--- a/rust/common/meson.build
+++ b/rust/common/meson.build
@@ -16,8 +16,6 @@ _common_rs = static_library(
'src/zeroable.rs',
],
),
- override_options: ['rust_std=2021', 'build.rust_std=2021'],
- rust_abi: 'rust',
rust_args: _common_cfg,
dependencies: [libc_rs, qemu_macros],
)
diff --git a/rust/migration/meson.build b/rust/migration/meson.build
index 444494700ad..94590dc1b87 100644
--- a/rust/migration/meson.build
+++ b/rust/migration/meson.build
@@ -36,8 +36,6 @@ _migration_rs = static_library(
],
{'.' : _migration_bindings_inc_rs},
),
- override_options: ['rust_std=2021', 'build.rust_std=2021'],
- rust_abi: 'rust',
link_with: [_util_rs, _bql_rs],
dependencies: [common_rs, glib_sys_rs, qemu_macros],
)
diff --git a/rust/qemu-macros/meson.build b/rust/qemu-macros/meson.build
index 17b2a4e2e24..cdea5bf439e 100644
--- a/rust/qemu-macros/meson.build
+++ b/rust/qemu-macros/meson.build
@@ -1,7 +1,6 @@
_qemu_macros_rs = rust.proc_macro(
'qemu_macros',
files('src/lib.rs'),
- override_options: ['rust_std=2021', 'build.rust_std=2021'],
dependencies: [
attrs_rs_native,
proc_macro2_rs_native,
diff --git a/rust/qom/meson.build b/rust/qom/meson.build
index e50f41858d6..551c4f0bf5f 100644
--- a/rust/qom/meson.build
+++ b/rust/qom/meson.build
@@ -26,8 +26,6 @@ _qom_rs = static_library(
],
{'.': _qom_bindings_inc_rs}
),
- override_options: ['rust_std=2021', 'build.rust_std=2021'],
- rust_abi: 'rust',
link_with: [_bql_rs, _migration_rs],
dependencies: [common_rs, glib_sys_rs, qemu_macros],
)
diff --git a/rust/system/meson.build b/rust/system/meson.build
index 73d61991146..2cd2dd36679 100644
--- a/rust/system/meson.build
+++ b/rust/system/meson.build
@@ -33,8 +33,6 @@ _system_rs = static_library(
],
{'.': _system_bindings_inc_rs}
),
- override_options: ['rust_std=2021', 'build.rust_std=2021'],
- rust_abi: 'rust',
link_with: [_bql_rs, _migration_rs, _qom_rs, _util_rs],
dependencies: [glib_sys_rs, common_rs, qemu_macros],
)
diff --git a/rust/tests/meson.build b/rust/tests/meson.build
index 00688c66fb1..3c5020490b0 100644
--- a/rust/tests/meson.build
+++ b/rust/tests/meson.build
@@ -2,7 +2,6 @@ test('rust-integration',
executable(
'rust-integration',
files('tests/vmstate_tests.rs'),
- override_options: ['rust_std=2021', 'build.rust_std=2021'],
rust_args: ['--test'],
install: false,
dependencies: [bql_rs, common_rs, util_rs, migration_rs, qom_rs]),
diff --git a/rust/trace/meson.build b/rust/trace/meson.build
index adca57e5507..1b3498f7fc1 100644
--- a/rust/trace/meson.build
+++ b/rust/trace/meson.build
@@ -11,9 +11,7 @@ _trace_rs = static_library(
'trace', # Library name,
lib_rs,
trace_rs_targets, # List of generated `.rs` custom targets
- override_options: ['rust_std=2021', 'build.rust_std=2021'],
dependencies: [libc_rs],
- rust_abi: 'rust',
)
trace_rs = declare_dependency(link_with: _trace_rs)
diff --git a/rust/util/meson.build b/rust/util/meson.build
index 8ad344dccbd..18d67a4b374 100644
--- a/rust/util/meson.build
+++ b/rust/util/meson.build
@@ -38,8 +38,6 @@ _util_rs = static_library(
],
{'.': _util_bindings_inc_rs}
),
- override_options: ['rust_std=2021', 'build.rust_std=2021'],
- rust_abi: 'rust',
dependencies: [anyhow_rs, libc_rs, foreign_rs, glib_sys_rs, common_rs, qom, qemuutil],
)
--
2.51.1
next prev parent reply other threads:[~2025-11-27 13:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-27 13:20 [PATCH 0/9] rust: build system and other cleanups Paolo Bonzini
2025-11-27 13:20 ` [PATCH 1/9] rust: remove leftover bindings/ Paolo Bonzini
2025-12-03 9:11 ` Zhao Liu
2025-11-27 13:20 ` [PATCH 2/9] rust: remove unused --cfg arguments Paolo Bonzini
2025-12-03 10:25 ` Zhao Liu
2025-11-27 13:20 ` Paolo Bonzini [this message]
2025-12-03 10:37 ` [PATCH 3/9] rust: remove unnecessary repetitive options Zhao Liu
2025-11-27 13:20 ` [PATCH 4/9] rust/bql: make bindings public Paolo Bonzini
2025-12-03 10:58 ` Zhao Liu
2025-11-27 13:20 ` [PATCH 5/9] rust: do not copy the SysBusDevice Paolo Bonzini
2025-12-03 10:59 ` Zhao Liu
2025-11-27 13:20 ` [PATCH 6/9] rust: fix reference to MemoryRegion Paolo Bonzini
2025-12-03 11:00 ` Zhao Liu
2025-11-27 13:20 ` [PATCH 7/9] rust: move strict lints handling to meson.build Paolo Bonzini
2025-12-03 15:29 ` Zhao Liu
2025-11-27 13:20 ` [PATCH 8/9] rust: Do not link qemuutil into Rust rlibs Paolo Bonzini
2025-11-27 13:20 ` [PATCH 9/9] rust: only link the Rust part of the code into devices Paolo Bonzini
2025-12-03 9:32 ` Paolo Bonzini
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=20251127132036.84384-4-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-rust@nongnu.org \
/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).