From nobody Sat Nov 15 05:14:23 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1755877378; cv=none; d=zohomail.com; s=zohoarc; b=cFE9vgMhsk1IxJ1xELCM513kMTByVeIPcm3LKgrbFJeBL1QMhp1TKHnG58dnxeLyAFmWbD0UttoTIpPnF+5FKhcqvS9bEyhSHmSBgb0xTeJjXllw7HM3pvoP8ymZnaGc4snMmyQGNzn5ACg5wrB+CemEHQOSTpW5t2YLkgsd9F4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755877378; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=O4sp5q9Ev0Q4evd/kMM89mk6qRydVkinYUvgIDfPHYY=; b=Eet41kbNc7sQ4tMJ2CQs9j6Wb0znMUsjNcVsZ2UWJ2Mw5u20gtT17MJYKV3q3SDq6MZylyfJ3U4S2IgBSPwHcUUQiaM1zk/V/Tn8n5aiqA8sTFe/X6eGK94NRozZMOczm6hScNIT4vE8GriLlqXMvAEjFUr09ymQXjHNhMygL5w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1755877377958527.2414981253484; Fri, 22 Aug 2025 08:42:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1upQsO-0005Sx-06; Fri, 22 Aug 2025 08:28:12 -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 1upQrw-0004wW-JH for qemu-devel@nongnu.org; Fri, 22 Aug 2025 08:27:59 -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 1upQru-0002Rs-7E for qemu-devel@nongnu.org; Fri, 22 Aug 2025 08:27:44 -0400 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-441-h_vCn4dGNvCkHxwc3p8Bag-1; Fri, 22 Aug 2025 08:27:39 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-afcb7377e95so166952966b.0 for ; Fri, 22 Aug 2025 05:27:39 -0700 (PDT) Received: from [192.168.10.3] ([151.95.56.250]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afded3119e9sm591143766b.40.2025.08.22.05.27.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 05:27:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755865661; 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=O4sp5q9Ev0Q4evd/kMM89mk6qRydVkinYUvgIDfPHYY=; b=XyE/UStOTslT3rZob6AvL/30UjFfoMflYRJSW2INTvdGGdSgcgIIFZXUciptrxxGuQ1c/G V1NctAHR8QE6STDK+tUc2szfalMIE1CJZnGH/PIhagP7VGDyyYImMBNgppgZTTn2Wgd0fn P13p5k5umWRIENCM9jy6375jMLBvRJA= X-MC-Unique: h_vCn4dGNvCkHxwc3p8Bag-1 X-Mimecast-MFC-AGG-ID: h_vCn4dGNvCkHxwc3p8Bag_1755865659 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755865658; x=1756470458; 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=O4sp5q9Ev0Q4evd/kMM89mk6qRydVkinYUvgIDfPHYY=; b=VC8lvYAPTWjWsRsJyq4ue07zS8R3Qr2UlfhASJ8bCtIWkGnaix+QYsywBdSyiLYkR9 4gHiqtYIOuA5UGwojEB1ChbzXIxlj7KqrhT4r+lQmadtViiXtKee50H5n8CSdg61YUuM Zv1yq63JqOnNW3OQX0fOOk6eYDXWJ2ucbJcYhGtiTBjxIXWBa5GMJYpxS+9Kq0iWMajs woCQbzmIpEKIXoUhTZr5OM8KeZleKn223O8Z3UlVM0u9xGPDCUaGxq4WiBpsqrOjG32r iNkTWwdFPJwNKCd7JjjJmaPl8JsAlvn33wotvOTRvs2v2xksg+2hs6lw1ghK+HggQXWg XnMg== X-Gm-Message-State: AOJu0YwnNrkZs7bi6R4a7GZ+uY4WSL0oobsFXEQR/RfGg7BZT3omud5t 1qwlYU3hgRAY1ru7fdOG1TyufwtzZDLYthks3Od9+yxu7U4gyAsImTYBC/6iKU1Da7IZ/FgXyx4 knbhUmhQMtmt0uwexqzVftdWhHdsQdtA6Q+o1YegUgagaEy0AcKz3FJ62euEMXfgt/2YhmeVUv3 p85UvNutK/9zYtImbeziWddoytLuM1nUwAHPWNNL0e X-Gm-Gg: ASbGncsMKoSj8Jj6SZv+ih/30HRahegnzeJ8ZNMPRhXJXQTlpn72zJWiz63fo3RkgF5 Xc4vN3W1zTsWgw5kBJ1Cgd8RVl6QT0kPzomJoc9VRrt4bcAz9ZaAel2e0NzWs/3Un3Gj0HwnoqF c1KCpg5J5f9xp9tdxi4aXh3poRNQzW4rx56DCqcZhkw1Yg2n7b5TreE109WDLeTz5+MsCjn3lC7 ArhvFpIzTwzzzzbDG9OeOTqt0CALp54moBy28YC8T+6axMkU8Tc8+U0FS04I6Gh3h4/LQ+3t0fs EOZIUt81GksTJ1w1xBPmvARUP1jU/Q/ApNfXtH0w1igWZ0xVE5XBJdn+ayAteFESVXE8JnIXNL9 aGzfGI7E8zuO4bnHEf3PqbpCSTb7lpBGGHKU4vlvy/g== X-Received: by 2002:a17:906:d554:b0:af9:a1e4:1bbd with SMTP id a640c23a62f3a-afe295d1a16mr216720866b.34.1755865658183; Fri, 22 Aug 2025 05:27:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFN8vi075IqxIozgEUykOUjz+ayTNpv9gsDWhZth6BdyNxNPZXnrJuJMgmjfEQyUwZyHGH88A== X-Received: by 2002:a17:906:d554:b0:af9:a1e4:1bbd with SMTP id a640c23a62f3a-afe295d1a16mr216717266b.34.1755865657620; Fri, 22 Aug 2025 05:27:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: tanishdesai37@gmail.com, stefanha@redhat.com, berrange@redhat.com, mads@ynddal.dk Subject: [PATCH 14/14] tracetool/syslog: add Rust support Date: Fri, 22 Aug 2025 14:26:55 +0200 Message-ID: <20250822122655.1353197-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250822122655.1353197-1-pbonzini@redhat.com> References: <20250822122655.1353197-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -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_H5=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1755877379169124100 Content-Type: text/plain; charset="utf-8" From: Tanish Desai The syslog backend needs the syslog function from libc and the LOG_INFO enum value; they are re-exported as "::trace::syslog" and "::trace::LOG_INFO" so that device crates do not all have to add the libc dependency, but otherwise there is nothing special. Signed-off-by: Paolo Bonzini --- rust/Cargo.lock | 3 +++ rust/trace/Cargo.toml | 3 +++ rust/trace/src/lib.rs | 4 +++ scripts/tracetool/backend/syslog.py | 7 ++++- tests/tracetool/syslog.rs | 41 +++++++++++++++++++++++++++++ tests/tracetool/tracetool-test.py | 2 +- 6 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 tests/tracetool/syslog.rs diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 6ed838f863f..e5f10cb358a 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -168,6 +168,9 @@ dependencies =3D [ [[package]] name =3D "trace" version =3D "0.1.0" +dependencies =3D [ + "libc", +] =20 [[package]] name =3D "unicode-ident" diff --git a/rust/trace/Cargo.toml b/rust/trace/Cargo.toml index 913010e9787..5f0f370e523 100644 --- a/rust/trace/Cargo.toml +++ b/rust/trace/Cargo.toml @@ -12,5 +12,8 @@ license.workspace =3D true repository.workspace =3D true rust-version.workspace =3D true =20 +[dependencies] +libc =3D { workspace =3D true } + [lints] workspace =3D true diff --git a/rust/trace/src/lib.rs b/rust/trace/src/lib.rs index 9b931ddf1de..966991432e3 100644 --- a/rust/trace/src/lib.rs +++ b/rust/trace/src/lib.rs @@ -1,6 +1,10 @@ //! This crate provides macros that aid in using QEMU's tracepoint //! functionality. =20 +#[doc(hidden)] +/// Re-exported items to avoid adding libc as a dependency everywhere. +pub use libc::{syslog, LOG_INFO}; + #[macro_export] /// Define the trace-points from the named directory (which should have sl= ashes /// replaced by underscore characters) as functions in a module called `tr= ace`. diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backen= d/syslog.py index 04ec85717a3..acaa56ba073 100644 --- a/scripts/tracetool/backend/syslog.py +++ b/scripts/tracetool/backend/syslog.py @@ -12,7 +12,7 @@ __email__ =3D "stefanha@redhat.com" =20 =20 -from tracetool import out +from tracetool import out, expand_format_string =20 =20 PUBLIC =3D True @@ -38,6 +38,11 @@ def generate_h(event, group): fmt=3Devent.fmt.rstrip("\n"), argnames=3Dargnames) =20 +def generate_rs(event, group): + out(' let format_string =3D c"%(fmt)s";', + ' unsafe {::trace::syslog(::trace::LOG_INFO, format_string.= as_ptr() as *const c_char, %(args)s);}', + fmt=3Dexpand_format_string(event.fmt), + args=3Devent.args.rust_call_varargs()) =20 def generate_h_backend_dstate(event, group): out(' trace_event_get_state_dynamic_by_id(%(event_id)s) || \\', diff --git a/tests/tracetool/syslog.rs b/tests/tracetool/syslog.rs new file mode 100644 index 00000000000..33a8ae7c1aa --- /dev/null +++ b/tests/tracetool/syslog.rs @@ -0,0 +1,41 @@ +// This file is autogenerated by tracetool, do not edit. + +#[allow(unused_imports)] +use std::ffi::c_char; +#[allow(unused_imports)] +use qemu_api::bindings; + +#[inline(always)] +fn trace_event_get_state_dynamic_by_id(_id: u16) -> bool { + unsafe { (trace_events_enabled_count !=3D 0) && (_id !=3D 0) } +} + +extern "C" { + static mut trace_events_enabled_count: u32; +} +extern "C" { + static mut _TRACE_TEST_BLAH_DSTATE: u16; + static mut _TRACE_TEST_WIBBLE_DSTATE: u16; +} +const _TRACE_TEST_BLAH_ENABLED: bool =3D true; +const _TRACE_TEST_WIBBLE_ENABLED: bool =3D true; + +#[inline(always)] +#[allow(dead_code)] +pub fn trace_test_blah(_context: *mut (), _filename: &std::ffi::CStr) +{ + if trace_event_get_state_dynamic_by_id(unsafe { _TRACE_TEST_BLAH_DSTAT= E}) { + let format_string =3D c"Blah context=3D%p filename=3D%s"; + unsafe {::trace::syslog(::trace::LOG_INFO, format_string.as_ptr() = as *const c_char, _context, _filename.as_ptr());} + } +} + +#[inline(always)] +#[allow(dead_code)] +pub fn trace_test_wibble(_context: *mut (), _value: std::ffi::c_int) +{ + if trace_event_get_state_dynamic_by_id(unsafe { _TRACE_TEST_WIBBLE_DST= ATE}) { + let format_string =3D c"Wibble context=3D%p value=3D%d"; + unsafe {::trace::syslog(::trace::LOG_INFO, format_string.as_ptr() = as *const c_char, _context, _value);} + } +} diff --git a/tests/tracetool/tracetool-test.py b/tests/tracetool/tracetool-= test.py index a91d635910a..d317e047891 100755 --- a/tests/tracetool/tracetool-test.py +++ b/tests/tracetool/tracetool-test.py @@ -13,7 +13,7 @@ def get_formats(backend): "c", "h", ] - if backend in {"ftrace", "log", "simple"}: + if backend in {"ftrace", "log", "simple", "syslog"}: formats +=3D ["rs"] if backend =3D=3D "dtrace": formats +=3D [ --=20 2.50.1