diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2025-09-08 12:50:02 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2025-09-17 19:00:58 +0200 |
| commit | e4444d71e85b5f5ea8311eb59fea3e52f5fc5a14 (patch) | |
| tree | 8f955e1324f0b039540c368db3537f10dcd8796a /rust/util | |
| parent | b0f6bf8a5b3b3a9dd4a11f792084d39a76b4b007 (diff) | |
| download | focaccia-qemu-e4444d71e85b5f5ea8311eb59fea3e52f5fc5a14.tar.gz focaccia-qemu-e4444d71e85b5f5ea8311eb59fea3e52f5fc5a14.zip | |
rust: re-export qemu macros from common/qom/hwcore
This is just a bit nicer. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Link: https://lore.kernel.org/r/20250827104147.717203-22-marcandre.lureau@redhat.com Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'rust/util')
| -rw-r--r-- | rust/util/Cargo.toml | 1 | ||||
| -rw-r--r-- | rust/util/meson.build | 2 | ||||
| -rw-r--r-- | rust/util/src/timer.rs | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/rust/util/Cargo.toml b/rust/util/Cargo.toml index 18e6619ca0..1f6767ed9d 100644 --- a/rust/util/Cargo.toml +++ b/rust/util/Cargo.toml @@ -17,7 +17,6 @@ anyhow = { workspace = true } foreign = { workspace = true } libc = { workspace = true } common = { path = "../common" } -qemu_macros = { path = "../qemu-macros" } [lints] workspace = true diff --git a/rust/util/meson.build b/rust/util/meson.build index 197872c9b2..87a893673d 100644 --- a/rust/util/meson.build +++ b/rust/util/meson.build @@ -39,7 +39,7 @@ _util_rs = static_library( ), override_options: ['rust_std=2021', 'build.rust_std=2021'], rust_abi: 'rust', - dependencies: [anyhow_rs, libc_rs, foreign_rs, common_rs, qemu_macros, qom, qemuutil], + dependencies: [anyhow_rs, libc_rs, foreign_rs, common_rs, qom, qemuutil], ) util_rs = declare_dependency(link_with: [_util_rs], dependencies: [qemuutil, qom]) diff --git a/rust/util/src/timer.rs b/rust/util/src/timer.rs index 622b6ee309..c6b3e4088e 100644 --- a/rust/util/src/timer.rs +++ b/rust/util/src/timer.rs @@ -15,14 +15,14 @@ use crate::bindings::{ /// A safe wrapper around [`bindings::QEMUTimer`]. #[repr(transparent)] -#[derive(Debug, qemu_macros::Wrapper)] +#[derive(Debug, common::Wrapper)] pub struct Timer(Opaque<bindings::QEMUTimer>); unsafe impl Send for Timer {} unsafe impl Sync for Timer {} #[repr(transparent)] -#[derive(qemu_macros::Wrapper)] +#[derive(common::Wrapper)] pub struct TimerListGroup(Opaque<bindings::QEMUTimerListGroup>); unsafe impl Send for TimerListGroup {} |