[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/24] rust/qemu-api: Add initial logging support based on C API
From: |
Paolo Bonzini |
Subject: |
[PULL 12/24] rust/qemu-api: Add initial logging support based on C API |
Date: |
Fri, 20 Jun 2025 18:40:40 +0200 |
From: Bernhard Beschow <shentey@gmail.com>
A log_mask_ln!() macro is provided which expects similar arguments as the
C version. However, the formatting works as one would expect from Rust.
To maximize code reuse the macro is just a thin wrapper around
qemu_log(). Also, just the bare minimum of logging masks is provided
which should suffice for the current use case of Rust in QEMU.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Link: 20250615112037.11992-2-shentey@gmail.com">https://lore.kernel.org/r/20250615112037.11992-2-shentey@gmail.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
docs/devel/rust.rst | 1 +
rust/qemu-api/wrapper.h | 2 +
rust/qemu-api/meson.build | 1 +
rust/qemu-api/src/lib.rs | 1 +
rust/qemu-api/src/log.rs | 73 ++++++++++++++++++++++++++++++++++++
rust/qemu-api/src/prelude.rs | 2 +
6 files changed, 80 insertions(+)
create mode 100644 rust/qemu-api/src/log.rs
diff --git a/docs/devel/rust.rst b/docs/devel/rust.rst
index 47e9677fcb0..dc8c44109e1 100644
--- a/docs/devel/rust.rst
+++ b/docs/devel/rust.rst
@@ -162,6 +162,7 @@ module status
``errno`` complete
``error`` stable
``irq`` complete
+``log`` proof of concept
``memory`` stable
``module`` complete
``qdev`` stable
diff --git a/rust/qemu-api/wrapper.h b/rust/qemu-api/wrapper.h
index 6060d3ba1ab..15a1b19847f 100644
--- a/rust/qemu-api/wrapper.h
+++ b/rust/qemu-api/wrapper.h
@@ -48,6 +48,8 @@ typedef enum memory_order {
#endif /* __CLANG_STDATOMIC_H */
#include "qemu/osdep.h"
+#include "qemu/log.h"
+#include "qemu/log-for-trace.h"
#include "qemu/module.h"
#include "qemu-io.h"
#include "system/system.h"
diff --git a/rust/qemu-api/meson.build b/rust/qemu-api/meson.build
index 5b8c7e5e8d5..a090297c458 100644
--- a/rust/qemu-api/meson.build
+++ b/rust/qemu-api/meson.build
@@ -62,6 +62,7 @@ _qemu_api_rs = static_library(
'src/errno.rs',
'src/error.rs',
'src/irq.rs',
+ 'src/log.rs',
'src/memory.rs',
'src/module.rs',
'src/prelude.rs',
diff --git a/rust/qemu-api/src/lib.rs b/rust/qemu-api/src/lib.rs
index c78198f0f41..86dcd8ef17a 100644
--- a/rust/qemu-api/src/lib.rs
+++ b/rust/qemu-api/src/lib.rs
@@ -21,6 +21,7 @@
pub mod errno;
pub mod error;
pub mod irq;
+pub mod log;
pub mod memory;
pub mod module;
pub mod qdev;
diff --git a/rust/qemu-api/src/log.rs b/rust/qemu-api/src/log.rs
new file mode 100644
index 00000000000..d6c3d6c1b63
--- /dev/null
+++ b/rust/qemu-api/src/log.rs
@@ -0,0 +1,73 @@
+// Copyright 2025 Bernhard Beschow <shentey@gmail.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+//! Bindings for QEMU's logging infrastructure
+
+#[repr(u32)]
+/// Represents specific error categories within QEMU's logging system.
+///
+/// The `Log` enum provides a Rust abstraction for logging errors,
corresponding
+/// to a subset of the error categories defined in the C implementation.
+pub enum Log {
+ /// Log invalid access caused by the guest.
+ /// Corresponds to `LOG_GUEST_ERROR` in the C implementation.
+ GuestError = crate::bindings::LOG_GUEST_ERROR,
+
+ /// Log guest access of unimplemented functionality.
+ /// Corresponds to `LOG_UNIMP` in the C implementation.
+ Unimp = crate::bindings::LOG_UNIMP,
+}
+
+/// A macro to log messages conditionally based on a provided mask.
+///
+/// The `log_mask_ln` macro checks whether the given mask matches the current
+/// log level and, if so, formats and logs the message. It is the Rust
+/// counterpart of the `qemu_log_mask()` macro in the C implementation.
+///
+/// # Parameters
+///
+/// - `$mask`: A log level mask. This should be a variant of the `Log` enum.
+/// - `$fmt`: A format string following the syntax and rules of the `format!`
+/// macro. It specifies the structure of the log message.
+/// - `$args`: Optional arguments to be interpolated into the format string.
+///
+/// # Example
+///
+/// ```
+/// use qemu_api::{log::Log, log_mask_ln};
+///
+/// let error_address = 0xbad;
+/// log_mask_ln!(Log::GuestError, "Address 0x{error_address:x} out of range");
+/// ```
+///
+/// It is also possible to use printf-style formatting, as well as having a
+/// trailing `,`:
+///
+/// ```
+/// use qemu_api::{log::Log, log_mask_ln};
+///
+/// let error_address = 0xbad;
+/// log_mask_ln!(
+/// Log::GuestError,
+/// "Address 0x{:x} out of range",
+/// error_address,
+/// );
+/// ```
+#[macro_export]
+macro_rules! log_mask_ln {
+ ($mask:expr, $fmt:tt $($args:tt)*) => {{
+ // Type assertion to enforce type `Log` for $mask
+ let _: Log = $mask;
+
+ if unsafe {
+ (::qemu_api::bindings::qemu_loglevel & ($mask as
std::os::raw::c_int)) != 0
+ } {
+ let formatted_string = format!("{}\n", format_args!($fmt
$($args)*));
+ let c_string = std::ffi::CString::new(formatted_string).unwrap();
+
+ unsafe {
+ ::qemu_api::bindings::qemu_log(c_string.as_ptr());
+ }
+ }
+ }};
+}
diff --git a/rust/qemu-api/src/prelude.rs b/rust/qemu-api/src/prelude.rs
index 43bfcd5fcab..8f9e23ee2c5 100644
--- a/rust/qemu-api/src/prelude.rs
+++ b/rust/qemu-api/src/prelude.rs
@@ -11,6 +11,8 @@
pub use crate::errno;
+pub use crate::log_mask_ln;
+
pub use crate::qdev::DeviceMethods;
pub use crate::qom::InterfaceType;
--
2.49.0
- [PULL 03/24] hw: Fix type constant for DTB files, (continued)
- [PULL 03/24] hw: Fix type constant for DTB files, Paolo Bonzini, 2025/06/20
- [PULL 02/24] target/i386: fix TB exit logic in gen_movl_seg() when writing to SS, Paolo Bonzini, 2025/06/20
- [PULL 04/24] pc-bios/dtb/meson: Prefer target name to be outfile, not infile, Paolo Bonzini, 2025/06/20
- [PULL 06/24] rust: hpet: fully initialize object during instance_init, Paolo Bonzini, 2025/06/20
- [PULL 05/24] rust: qemu_api: introduce MaybeUninit field projection, Paolo Bonzini, 2025/06/20
- [PULL 08/24] rust: qom: make ParentInit lifetime-invariant, Paolo Bonzini, 2025/06/20
- [PULL 09/24] rust: qom: change instance_init to take a ParentInit<>, Paolo Bonzini, 2025/06/20
- [PULL 10/24] rust: prepare variable definitions for multiple bindgen invocations, Paolo Bonzini, 2025/06/20
- [PULL 11/24] rust: move rust.bindgen to qemu-api crate, Paolo Bonzini, 2025/06/20
- [PULL 07/24] rust: qom: introduce ParentInit, Paolo Bonzini, 2025/06/20
- [PULL 12/24] rust/qemu-api: Add initial logging support based on C API,
Paolo Bonzini <=
- [PULL 13/24] rust: pl011: Implement logging, Paolo Bonzini, 2025/06/20
- [PULL 14/24] rust: pl011: Add missing logging to match C version, Paolo Bonzini, 2025/06/20
- [PULL 15/24] rust: hpet: fix new warning, Paolo Bonzini, 2025/06/20
- [PULL 16/24] i386/cpu: Move adjustment of CPUID_EXT_PDCM before feature_dependencies[] check, Paolo Bonzini, 2025/06/20
- [PULL 17/24] i386/cpu: Warn about why CPUID_EXT_PDCM is not available, Paolo Bonzini, 2025/06/20
- [PULL 18/24] i386/tdx: Error and exit when named cpu model is requested, Paolo Bonzini, 2025/06/20
- [PULL 19/24] i386/cpu: Rename enable_cpuid_0x1f to force_cpuid_0x1f, Paolo Bonzini, 2025/06/20
- [PULL 20/24] i386/tdx: Fix the typo of the comment of struct TdxGuest, Paolo Bonzini, 2025/06/20
- [PULL 21/24] i386/tdx: Clarify the error message of mrconfigid/mrowner/mrownerconfig, Paolo Bonzini, 2025/06/20
- [PULL 22/24] update Linux headers to v6.16-rc3, Paolo Bonzini, 2025/06/20