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 lists1p.gnu.org (lists1p.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 BBDF0CA5FCE for ; Mon, 5 Oct 2026 12:10:44 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xDhWW-0006TE-9N; Mon, 05 Oct 2026 08:10:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xDhVb-00065t-00 for qemu-devel@nongnu.org; Mon, 05 Oct 2026 08:09:41 -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 1xDhVZ-0004kZ-5f for qemu-devel@nongnu.org; Mon, 05 Oct 2026 08:09:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1791202168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6qAl96mNNSBwXYNBV6pEPP9tW7aYvrN/pvq74TUOnIw=; b=R7vTR8tejWXMVH6MkRNLhXpXxxlo5VGvYlsmq0CR62vF1QFaAggaLWJrJ6g0VLA/OqhlrK cmBMoeyGAV+gMmUoBGxZU/AU+tU0MoThLScaStsdqWDOl0FYk0hL8nLeb0wsGnxVw610Kx cjQJxl1+crH97dtJgJRjYKPem/qk5E4= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-519-KZ_WTGiTPx2ecGOP6TH7kA-1; Mon, 05 Oct 2026 08:09:24 -0400 X-MC-Unique: KZ_WTGiTPx2ecGOP6TH7kA-1 X-Mimecast-MFC-AGG-ID: KZ_WTGiTPx2ecGOP6TH7kA_1791202163 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B83C01955BFE; Mon, 5 Oct 2026 12:09:23 +0000 (UTC) Received: from berrange.csb (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4C0FC3001D29; Mon, 5 Oct 2026 12:09:22 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v3 14/24] trace: include probe name in Rust format strings Date: Mon, 5 Oct 2026 13:08:45 +0100 Message-ID: <20261005120855.421973-15-berrange@redhat.com> In-Reply-To: <20261005120855.421973-1-berrange@redhat.com> References: <20261005120855.421973-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 10 X-Spam_score: 1.0 X-Spam_bar: + X-Spam_report: (1.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.24, 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_H2=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 The C format strings all include the probe name as a prefix, however, this was missed in the Rust generators for ftrace and syslog. Signed-off-by: Daniel P. Berrangé --- scripts/tracetool/backend/ftrace.py | 2 +- scripts/tracetool/backend/syslog.py | 2 +- tests/tracetool/all.rs | 8 ++++---- tests/tracetool/ftrace.rs | 4 ++-- tests/tracetool/syslog.rs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backend/ftrace.py index e03698a2edf..ba2a0c83770 100644 --- a/scripts/tracetool/backend/ftrace.py +++ b/scripts/tracetool/backend/ftrace.py @@ -47,5 +47,5 @@ def generate_h_backend_dstate(event, group): def generate_rs(event, group): out(' let format_string = c"%(fmt)s";', ' unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_char, %(args)s);}', - fmt=expand_format_string(event.fmt), + fmt=expand_format_string(event.fmt, event.name + " "), args=event.args.rust_call_varargs()) diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backend/syslog.py index 12b826593db..746efd35fb9 100644 --- a/scripts/tracetool/backend/syslog.py +++ b/scripts/tracetool/backend/syslog.py @@ -41,7 +41,7 @@ def generate_h(event, group): def generate_rs(event, group): out(' let format_string = c"%(fmt)s";', ' unsafe {::trace::syslog(::trace::LOG_INFO, format_string.as_ptr() as *const c_char, %(args)s);}', - fmt=expand_format_string(event.fmt), + fmt=expand_format_string(event.fmt, event.name + " "), args=event.args.rust_call_varargs()) def generate_h_backend_dstate(event, group): diff --git a/tests/tracetool/all.rs b/tests/tracetool/all.rs index c8c9d288366..14afd86281e 100644 --- a/tests/tracetool/all.rs +++ b/tests/tracetool/all.rs @@ -47,7 +47,7 @@ pub fn trace_test_blah(_context: *mut (), _filename: &std::ffi::CStr) { ::trace::probe!(qemu, test_blah, _context, _filename.as_ptr()); if trace_event_state_is_enabled(unsafe { _TRACE_TEST_BLAH_DSTATE}) { - let format_string = c"Blah context=%p filename=%s"; + let format_string = c"test_blah Blah context=%p filename=%s"; unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_char, _context /* as *mut () */, _filename.as_ptr());} let format_string = c"test_blah Blah context=%p filename=%s\n"; if (unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) != 0 { @@ -55,7 +55,7 @@ pub fn trace_test_blah(_context: *mut (), _filename: &std::ffi::CStr) } extern "C" { fn _simple_trace_test_blah(_context: *mut (), _filename: *const std::ffi::c_char); } unsafe { _simple_trace_test_blah(_context, _filename.as_ptr()); } - let format_string = c"Blah context=%p filename=%s"; + let format_string = c"test_blah Blah context=%p filename=%s"; unsafe {::trace::syslog(::trace::LOG_INFO, format_string.as_ptr() as *const c_char, _context /* as *mut () */, _filename.as_ptr());} } } @@ -75,7 +75,7 @@ pub fn trace_test_wibble(_context: *mut (), _value: std::ffi::c_int) { ::trace::probe!(qemu, test_wibble, _context, _value); if trace_event_state_is_enabled(unsafe { _TRACE_TEST_WIBBLE_DSTATE}) { - let format_string = c"Wibble context=%p value=%d"; + let format_string = c"test_wibble Wibble context=%p value=%d"; unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_char, _context /* as *mut () */, _value /* as std::ffi::c_int */);} let format_string = c"test_wibble Wibble context=%p value=%d\n"; if (unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) != 0 { @@ -83,7 +83,7 @@ pub fn trace_test_wibble(_context: *mut (), _value: std::ffi::c_int) } extern "C" { fn _simple_trace_test_wibble(_context: *mut (), _value: std::ffi::c_int); } unsafe { _simple_trace_test_wibble(_context, _value); } - let format_string = c"Wibble context=%p value=%d"; + let format_string = c"test_wibble Wibble context=%p value=%d"; unsafe {::trace::syslog(::trace::LOG_INFO, format_string.as_ptr() as *const c_char, _context /* as *mut () */, _value /* as std::ffi::c_int */);} } } diff --git a/tests/tracetool/ftrace.rs b/tests/tracetool/ftrace.rs index ff0bcde4b8b..39959d3fdd1 100644 --- a/tests/tracetool/ftrace.rs +++ b/tests/tracetool/ftrace.rs @@ -36,7 +36,7 @@ pub fn trace_test_blah_enabled() -> bool pub fn trace_test_blah(_context: *mut (), _filename: &std::ffi::CStr) { if trace_event_state_is_enabled(unsafe { _TRACE_TEST_BLAH_DSTATE}) { - let format_string = c"Blah context=%p filename=%s"; + let format_string = c"test_blah Blah context=%p filename=%s"; unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_char, _context /* as *mut () */, _filename.as_ptr());} } } @@ -54,7 +54,7 @@ pub fn trace_test_wibble_enabled() -> bool pub fn trace_test_wibble(_context: *mut (), _value: std::ffi::c_int) { if trace_event_state_is_enabled(unsafe { _TRACE_TEST_WIBBLE_DSTATE}) { - let format_string = c"Wibble context=%p value=%d"; + let format_string = c"test_wibble Wibble context=%p value=%d"; unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_char, _context /* as *mut () */, _value /* as std::ffi::c_int */);} } } diff --git a/tests/tracetool/syslog.rs b/tests/tracetool/syslog.rs index 9688dac84a5..b90ad4be7f4 100644 --- a/tests/tracetool/syslog.rs +++ b/tests/tracetool/syslog.rs @@ -36,7 +36,7 @@ pub fn trace_test_blah_enabled() -> bool pub fn trace_test_blah(_context: *mut (), _filename: &std::ffi::CStr) { if trace_event_state_is_enabled(unsafe { _TRACE_TEST_BLAH_DSTATE}) { - let format_string = c"Blah context=%p filename=%s"; + let format_string = c"test_blah Blah context=%p filename=%s"; unsafe {::trace::syslog(::trace::LOG_INFO, format_string.as_ptr() as *const c_char, _context /* as *mut () */, _filename.as_ptr());} } } @@ -54,7 +54,7 @@ pub fn trace_test_wibble_enabled() -> bool pub fn trace_test_wibble(_context: *mut (), _value: std::ffi::c_int) { if trace_event_state_is_enabled(unsafe { _TRACE_TEST_WIBBLE_DSTATE}) { - let format_string = c"Wibble context=%p value=%d"; + let format_string = c"test_wibble Wibble context=%p value=%d"; unsafe {::trace::syslog(::trace::LOG_INFO, format_string.as_ptr() as *const c_char, _context /* as *mut () */, _value /* as std::ffi::c_int */);} } } -- 2.55.0