From nobody Thu Nov 5 07:29:17 2026 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=1793823691; cv=none; d=zohomail.com; s=zohoarc; b=UB/ZUfV0CTWWDVJkMmDEK40de257mYp6kw/hwqS+IEm4J8UcSgoqRMW1zuS3KYv1gPT5vVobbnEWA1iBHj8HnAM1QC+ut5LssA1X7352zWxQnRq42y2eVGqmWEayZAUAwEeS5kDMPnFH56203weGb+5pjziBmlXV9IqMsF4Z5WY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823691; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TqkKXu2f79+4gbliMkvun6ZA/q+B5xT3gEohpgAcSnM=; b=R5emrKjgVmaMlC0jxWdXb0pcZqOBomrHOz8CM3n4R92y5yV0uNRzsH8l1tAJL7b5skJyWkb82AYWANepPcUNTve7x409rKHw8zCldC9hiIIn3rOAnR3p5ZGp8qAtl4k5x2HwtHsptzmK4bb9k3dHjWXf2QuKckm/hNyAvu8KdfQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1793823691875233.246750880778; Wed, 4 Nov 2026 12:21:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRA-0006um-Nu; Wed, 04 Nov 2026 15:18:24 -0500 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 1xOhR7-0006sG-MQ for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xOhR6-000637-3E for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:21 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-444-Saaa4D5FPI6OohZgO6qhLQ-1; Wed, 04 Nov 2026 15:18:16 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 07399180059D; Wed, 4 Nov 2026 20:18:07 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1D6A5195604E; Wed, 4 Nov 2026 20:18:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823499; 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=TqkKXu2f79+4gbliMkvun6ZA/q+B5xT3gEohpgAcSnM=; b=M+BTIXjmFCKYbfi4/cUOI0p3p5YdORd8tOlUy9cNVMdxVf1mXPCvb3ZvJ8dgDsDWxUeQqa +BYi3j+TcKboSoYEMDe1hD/501+YBdmXyt69DiPp0od8R9zL7QPMp38ihgdnb7YAkJPVri CwiWfEzz4sL/0nLH53g1ydTx5vHbeMo= X-MC-Unique: Saaa4D5FPI6OohZgO6qhLQ-1 X-Mimecast-MFC-AGG-ID: Saaa4D5FPI6OohZgO6qhLQ_1793823487 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 01/25] osdep: add 'ignore_value(x)' macro Date: Wed, 4 Nov 2026 15:17:37 -0500 Message-ID: <20261104201802.11556-2-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823692385158500 From: Daniel P. Berrang=C3=A9 Functions annotated with 'warn_unused_result' cannot be cast to (void) to silence the compiler. Add the ignore_value() macro which tricks the compiler into thinking the result is genuinely used, avoiding the need for manual workarounds where the return value is intentionally ignored. This clever macro is derived from one originating with the GNULIB project: https://gitweb.git.savannah.gnu.org/gitweb/?p=3Dgnulib.git;a=3Dblob;f=3Dl= ib/ignore-value.h;hb=3DHEAD but simplified since we don't need compat with old GCC and optimizing on clang is overkill. Reviewed-by: Eric Blake Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-2-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- include/qemu/osdep.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 50c7ce33b6a..b27d159d5bb 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -251,6 +251,14 @@ extern "C" { #endif =20 =20 +/* + * Merely casting to (void) is not sufficient for functions + * annotated with the "warn_unused_result" attribute + */ +#define ignore_value(x) \ + (__extension__ ({ __typeof__(x) __x =3D (x); (void) __x; })) + + /* * For mingw, as of v6.0.0, the function implementing the assert macro is * not marked as noreturn, so the compiler cannot delete code following an --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1793823523; cv=none; d=zohomail.com; s=zohoarc; b=jNCA0dhDIQiz2bQ14BGeJrXLoKrfaKbaUFGmfIPAAPYQe2X0gZNQBW42Z4XhdMAvHk7OJXGFHWq1W72hDfDf0+5KX96vOgFVjZDX8Djw2z1StnNCpevJq+DMXnwdvoPShn3GfPA1u58RdxxQQQ7nQhPuvBYwd1t0DLXXFTRxoUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823523; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jKP5HFz810ebf9alfWmuhAqqhtocmxxt5vjo0KJQomg=; b=RAjOf8HIkO+gY6WC8Ho23GVgAzDzNgOOgvfPXyA+PMw//u991i5CsW27qlpeROoZ/stbQSC4nHfSeTcWkGq+QqplnQhLV9Gkt3ppUQWepawJzCd7hALre/IidD6B8B+5nJV2PDrwhMZt+6CcngZoc5LWvj9qXb91jFgQ4VXIrtc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1793823523458970.3553611657504; Wed, 4 Nov 2026 12:18:43 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1472511.1680335 (Exim 4.92) (envelope-from ) id 1xOhR3-0006l2-Fq; Wed, 04 Nov 2026 20:18:17 +0000 Received: by outflank-mailman (output) from mailman id 1472511.1680335; Wed, 04 Nov 2026 20:18:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhR3-0006kr-Ao; Wed, 04 Nov 2026 20:18:17 +0000 Received: by outflank-mailman (input) for mailman id 1472511; Wed, 04 Nov 2026 20:18:16 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhR2-0006kl-GI for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 20:18:16 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1xOhR1-00FVKT-TK for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 21:18:15 +0100 Received: from [10.42.69.1] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6aeb92cc-bab6-0a2a0a5309dd-0a2a45019152-42 for ; Wed, 04 Nov 2026 21:18:15 +0100 Received: from [170.10.129.124] (helo=us-smtp-delivery-124.mimecast.com) by tlsNG-d62444.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6aeb9306-5984-0a2a45010019-aa0a817c8983-3 for ; Wed, 04 Nov 2026 21:18:15 +0100 Received: from mx-prod-mc-03.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-581-UbiHqfl6O8qu1UKLLUissw-1; Wed, 04 Nov 2026 15:18:12 -0500 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 13EDA1955DD6; Wed, 4 Nov 2026 20:18:09 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0186139206; Wed, 4 Nov 2026 20:18:07 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=mimecast20190719 header.d=redhat.com header.i="@redhat.com" header.h="From:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823493; 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=jKP5HFz810ebf9alfWmuhAqqhtocmxxt5vjo0KJQomg=; b=NtRPeRQGbAQIudRlFmTmh46UJ6Lz9EYgYUbWBgIhpYpC9Td/t77bRlYfJVRmSXmVT6exIO dJPGBDgFhL+6Vfj0+HWRJ0qfcTMXT7vJMlmH5NB4eG2OyrSAlfNWTwd+lBCUQkb5EshDmJ yW07FIUTZPpfEenQsv3xWXn4UyBtfN4= X-MC-Unique: UbiHqfl6O8qu1UKLLUissw-1 X-Mimecast-MFC-AGG-ID: UbiHqfl6O8qu1UKLLUissw_1793823489 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 02/25] trace: use 'ignore_value()' instead of a dummy variable Date: Wed, 4 Nov 2026 15:17:38 -0500 Message-ID: <20261104201802.11556-3-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 X-Mimecast-MFC-PROC-ID: _KbILR3izsUpT4IbHrYUAjGQl6aVXuCmP9jWhRuq-cQ_1793823489 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-d62444/1793823495-BE664757-F6DAF0A9/35/111497 X-purgate-type: clean X-purgate-size: 2669 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823525338158501 From: Daniel P. Berrang=C3=A9 This pattern is more concise than using a dummy variable which in turn needs annotating as unused. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-3-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- trace/ftrace.c | 3 +-- trace/simple.c | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/trace/ftrace.c b/trace/ftrace.c index 6875faedb9c..c1ed6ad4454 100644 --- a/trace/ftrace.c +++ b/trace/ftrace.c @@ -41,7 +41,6 @@ static int find_mount(char *mount_point, const char *fsty= pe) void ftrace_write(const char *fmt, ...) { char ftrace_buf[MAX_TRACE_STRLEN]; - int unused __attribute__ ((unused)); int trlen; va_list ap; =20 @@ -50,7 +49,7 @@ void ftrace_write(const char *fmt, ...) va_end(ap); =20 trlen =3D MIN(trlen, MAX_TRACE_STRLEN - 1); - unused =3D write(trace_marker_fd, ftrace_buf, trlen); + ignore_value(write(trace_marker_fd, ftrace_buf, trlen)); } =20 bool ftrace_init(void) diff --git a/trace/simple.c b/trace/simple.c index c0aba00cb7f..e148ca44530 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -163,7 +163,6 @@ static gpointer writeout_thread(gpointer opaque) } dropped; unsigned int idx =3D 0; int dropped_count; - size_t unused __attribute__ ((unused)); uint64_t type =3D TRACE_RECORD_TYPE_EVENT; =20 for (;;) { @@ -179,13 +178,13 @@ static gpointer writeout_thread(gpointer opaque) } while (!g_atomic_int_compare_and_exchange(&dropped_events, dropped_count, 0)); dropped.rec.arguments[0] =3D dropped_count; - unused =3D fwrite(&type, sizeof(type), 1, trace_fp); - unused =3D fwrite(&dropped.rec, dropped.rec.length, 1, trace_f= p); + ignore_value(fwrite(&type, sizeof(type), 1, trace_fp)); + ignore_value(fwrite(&dropped.rec, dropped.rec.length, 1, trace= _fp)); } =20 while (get_trace_record(idx, &recordptr)) { - unused =3D fwrite(&type, sizeof(type), 1, trace_fp); - unused =3D fwrite(recordptr, recordptr->length, 1, trace_fp); + ignore_value(fwrite(&type, sizeof(type), 1, trace_fp)); + ignore_value(fwrite(recordptr, recordptr->length, 1, trace_fp)= ); writeout_idx +=3D recordptr->length; free(recordptr); /* don't use g_free, can deadlock when traced= */ idx =3D writeout_idx % TRACE_BUF_LEN; --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823683; cv=none; d=zohomail.com; s=zohoarc; b=UgBarhjZPQ1v6QoRU7x7II1PHK3Wr2IREt9hH4/laOA57EyAWH6FubS4xHTk9Hgup+HvuojX2gMn0+0PQT8KzFijTbqNQkUSirXHNaQDqS2YFh12SEWgu5maJp221JL/u8z35x0FuEFM9FYLMLC8wN0YsaplfELEOzPAA4HsIsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823683; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hPW7K8e9PhjSibqn/e/tSwEgnDdS9m32/bMUTsYxbh0=; b=Oqls8kmcDiGmanR9B1hGZghUZAuXumOgAdugCjd84ZVSbOOQWNmf5FC7HWLylZxu7fdyQf6y19e4oBd+w5DHeuoS5GHh78n8YKRZgXUx72YLkqErX7W0Kj6CtwsHveAobp/s01ZvaYlN58f8YLQdsL3Uq0HaMnNuFDwdeQpsAU8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1793823683634534.3615195148707; Wed, 4 Nov 2026 12:21:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhR7-0006sZ-VM; Wed, 04 Nov 2026 15:18:22 -0500 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 1xOhR5-0006rN-PT for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:20 -0500 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 1xOhR3-00062b-W6 for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:19 -0500 Received: from mx-prod-mc-01.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-655-JDL770NYNC2MMGl88jTgGA-1; Wed, 04 Nov 2026 15:18:13 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E645019560B2; Wed, 4 Nov 2026 20:18:10 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 32B22195604C; Wed, 4 Nov 2026 20:18:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823497; 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=hPW7K8e9PhjSibqn/e/tSwEgnDdS9m32/bMUTsYxbh0=; b=HmNMwLvmuh7goAFNtVgmdsRnCcDyTfwWB/Ya8+2rwWz6LNKjerzljrsZO1zuZ/IfsZHdUn IuEkotY+iQ9ZM5y//nbVegMH+gjw2GvMqPvD6W733PeiJcNv9zbiN35p3/igHpMhAUIiqB UFJTjTpP3u2nlqGF3KnRaTJ+P8gDWKc= X-MC-Unique: JDL770NYNC2MMGl88jTgGA-1 X-Mimecast-MFC-AGG-ID: JDL770NYNC2MMGl88jTgGA_1793823491 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 03/25] trace: fix handling of char** in UST backend Date: Wed, 4 Nov 2026 15:17:39 -0500 Message-ID: <20261104201802.11556-4-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823684182158500 From: Daniel P. Berrang=C3=A9 The UST trace backend fails to compile on version 2.14.0, as we pass a "char **" arg as to ctf_string(), which only expects 'char *'. It should instead be treated the same way as generic pointers, and emitted as hex. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-4-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- scripts/tracetool/format/ust_events_h.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/tracetool/format/ust_events_h.py b/scripts/tracetool/f= ormat/ust_events_h.py index cee7970a403..76c883bc5c0 100644 --- a/scripts/tracetool/format/ust_events_h.py +++ b/scripts/tracetool/format/ust_events_h.py @@ -72,7 +72,9 @@ def generate(events, backend, group): names =3D e.args.names() fmts =3D e.formats() for t,n,f in zip(types, names, fmts): - if ('char *' in t) or ('char*' in t): + if ('char **' in t) or ('char**' in t): + out(' ctf_integer_hex(' + t + ', ' + n + ', ' + = n + ')') + elif ('char *' in t) or ('char*' in t): out(' ctf_string(' + n + ', ' + n + ')') elif ("%p" in f) or ("x" in f) or ("PRIx" in f): out(' ctf_integer_hex('+ t + ', ' + n + ', ' + n= + ')') --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1793823520; cv=none; d=zohomail.com; s=zohoarc; b=aehxCveGvdg5CPT0Cptbg8HBHs77mib/EbmOZC9T1dYWhpht0rVugyJrRVhENuy5gOt8BU33Ct422MRUh3Fv533zPBYI2WrxhGjEJIk7gRXzI1w9c3UOOG+LvWerFdVYaurnoK0hAd4T+lja5fdNFJniVxE4I7SXJAn9nLfgIsk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823520; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VsdKm1LSZTE764H3BvnnumzwQKzcHlHW/sITvbevc3A=; b=iwNmV2p+MM7U/LP0iAX4WFLHMcf9hZLRBIQWD8mv3Y72cqRo3T0yiP4MuK2dCG6tCf3GuyWhvp8naBev1tau/Ozh3md9AvYgWxrKPIS0hD/f2/kpyXjpDFWCBtHK1BHS9PW4cLy00TFtr37SZQ+2zgFF3OGLdVks8iiQdG1gXsI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 17938235199351002.6663135528515; Wed, 4 Nov 2026 12:18:39 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1472512.1680343 (Exim 4.92) (envelope-from ) id 1xOhR7-0006zA-MI; Wed, 04 Nov 2026 20:18:21 +0000 Received: by outflank-mailman (output) from mailman id 1472512.1680343; Wed, 04 Nov 2026 20:18:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhR7-0006yz-Iy; Wed, 04 Nov 2026 20:18:21 +0000 Received: by outflank-mailman (input) for mailman id 1472512; Wed, 04 Nov 2026 20:18:19 +0000 Received: from mx.expurgate.net ([194.145.224.20]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhR5-0006yh-UR for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 20:18:19 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1xOhR5-00FaIj-BH for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 21:18:19 +0100 Received: from [10.42.69.12] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6aeb92e1-8faa-0a2a0a5109dd-0a2a450cab48-42 for ; Wed, 04 Nov 2026 21:18:19 +0100 Received: from [170.10.129.124] (helo=us-smtp-delivery-124.mimecast.com) by tlsNG-d25034.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6aeb930a-f479-0a2a450c0019-aa0a817c6587-3 for ; Wed, 04 Nov 2026 21:18:19 +0100 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-685-q0c7-ZoyMI6eDXRYxmbnqg-1; Wed, 04 Nov 2026 15:18:14 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 98ED8195605F; Wed, 4 Nov 2026 20:18:12 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B7AFE1956089; Wed, 4 Nov 2026 20:18:11 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=mimecast20190719 header.d=redhat.com header.i="@redhat.com" header.h="From:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823497; 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=VsdKm1LSZTE764H3BvnnumzwQKzcHlHW/sITvbevc3A=; b=M1YqrL6Zm1IANN3XUkYhlsHDqz/mQPknNzVZMZ89WTRiucbzohPdEMGz0ly5NtEn8v9ByY DE54brExUDzcq99pRBvmau8oMO+C50ZAazK5vO9Qp99HkXdKwSrcBxhWrdtKt6KG+2fGiC 4FI0D1vZrrNzxKK793r/r2wsTTkKnFg= X-MC-Unique: q0c7-ZoyMI6eDXRYxmbnqg-1 X-Mimecast-MFC-AGG-ID: q0c7-ZoyMI6eDXRYxmbnqg_1793823492 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL v2 04/25] hw/xen: replace "long unsigned int" with "unsigned long " for dtrace Date: Wed, 4 Nov 2026 15:17:40 -0500 Message-ID: <20261104201802.11556-5-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-MFC-PROC-ID: hNX9eAkhkXr6LnVRE9wFdEOvgkiyRCaKA4Qu23qsZmU_1793823492 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-d25034/1793823499-00ECAA5B-BC52033E/35/111497 X-purgate-type: clean X-purgate-size: 1986 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823521209158500 From: Daniel P. Berrang=C3=A9 dtrace (or at least systemtap's fake "dtrace" binary) doesn't like to see "int" and "long" together in the typename, it just wants the bare "long". Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-5-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- hw/xen/trace-events | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xen/trace-events b/hw/xen/trace-events index b67942d07b4..a31983ce1d3 100644 --- a/hw/xen/trace-events +++ b/hw/xen/trace-events @@ -57,8 +57,8 @@ cpu_ioreq_config_read(void *req, uint32_t sbdf, uint32_t = reg, uint32_t size, uin cpu_ioreq_config_write(void *req, uint32_t sbdf, uint32_t reg, uint32_t si= ze, uint32_t data) "I/O=3D%p sbdf=3D0x%x reg=3D%u size=3D%u data=3D0x%x" cpu_get_ioreq_from_shared_memory_req_not_ready(int state, int data_is_ptr,= uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O request = not ready: 0x%x, ptr: 0x%x, port: 0x%"PRIx64", data: 0x%"PRIx64", count: %u= , size: %u" xen_main_loop_prepare_init_cpu(int id, void *cpu) "cpu_by_vcpu_id[%d]=3D%p" -xen_map_ioreq_server_shared_page(long unsigned int ioreq_pfn) "shared page= at pfn 0x%lx" -xen_map_ioreq_server_buffered_io_page(long unsigned int ioreq_pfn) "buffer= ed io page at pfn 0x%lx" +xen_map_ioreq_server_shared_page(unsigned long ioreq_pfn) "shared page at = pfn 0x%lx" +xen_map_ioreq_server_buffered_io_page(unsigned long ioreq_pfn) "buffered i= o page at pfn 0x%lx" xen_map_ioreq_server_buffered_io_evtchn(int bufioreq_evtchn) "buffered io = evtchn is 0x%x" destroy_hvm_domain_cannot_acquire_handle(void) "Cannot acquire xenctrl han= dle" destroy_hvm_domain_failed_action(const char *action, int sts, char *errno_= s) "xc_domain_shutdown failed to issue %s, sts %d, %s" --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1793823536; cv=none; d=zohomail.com; s=zohoarc; b=a3NLVCblwBe0eJQv3eehVjLIeqobtJbPRNtWgzJfEU7r7FDduQDHhX+CktO+dJgXNr/b5J4ucGpfIzpZ9sY1mZTOKxEMQUBAvhWh3yLNmAidZm8xKmE3TgPEK2pRyD4VNZDhLbGZHGuSSdYQUD8ylQ3z2RgwhbgB8lp8p5s9+3U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823536; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5CRUR1O7jhB6e7y26qawG8i1UCupwuJ1vSueU290k1s=; b=R2ryz4k+Ha+pJVWICbpMg3nwQKWkE0tm9mSEuAoaNlvo1DFi7mWR81zisefF02ZQjP8u4OeziFglTFbzWBukam3/KCqiaEIOfEWT70HWU+rzoY0k4i4MUWMvrHj9u97YWJwVOvb/TlT67/elRsSbnXSRqDmydZc1KAby/d58oXs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1793823536563425.8130445242979; Wed, 4 Nov 2026 12:18:56 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1472520.1680397 (Exim 4.92) (envelope-from ) id 1xOhRF-0008O5-HS; Wed, 04 Nov 2026 20:18:29 +0000 Received: by outflank-mailman (output) from mailman id 1472520.1680397; Wed, 04 Nov 2026 20:18:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRF-0008Nt-Cz; Wed, 04 Nov 2026 20:18:29 +0000 Received: by outflank-mailman (input) for mailman id 1472520; Wed, 04 Nov 2026 20:18:27 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRD-0008Bp-BJ for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 20:18:27 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1xOhR7-007PCO-OL for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 21:18:21 +0100 Received: from [10.42.69.11] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6aeb92ed-e002-0a2a0a5209dd-0a2a450b9f1c-22 for ; Wed, 04 Nov 2026 21:18:21 +0100 Received: from [170.10.129.124] (helo=us-smtp-delivery-124.mimecast.com) by tlsNG-42698a.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6aeb930c-b7e8-0a2a450b0019-aa0a817ccaf9-3 for ; Wed, 04 Nov 2026 21:18:21 +0100 Received: from mx-prod-mc-03.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-629-i7IYKqUFNF-_rcqAOOI-mw-1; Wed, 04 Nov 2026 15:18:16 -0500 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4904F1955D57; Wed, 4 Nov 2026 20:18:14 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6B5FF301D919; Wed, 4 Nov 2026 20:18:13 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=mimecast20190719 header.d=redhat.com header.i="@redhat.com" header.h="From:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823500; 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=5CRUR1O7jhB6e7y26qawG8i1UCupwuJ1vSueU290k1s=; b=aKEEuN3RbZ5Fc5ujPBoN+gMUdMRjsz94HUfESHOvBUjI7o/s+c0AMxsHVX+dCNzyvMzv1i 9coO858yLelD9y0+gJj1lm1DykvgermHf2A8lxDgQHEwR/HD1c1GWqr1VIPIr9mzuB1Aj1 aHK8qpgNNImBH1wZXEhjzXE+JV2sdys= X-MC-Unique: i7IYKqUFNF-_rcqAOOI-mw-1 X-Mimecast-MFC-AGG-ID: i7IYKqUFNF-_rcqAOOI-mw_1793823494 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 05/25] trace: block use of "long int" for dtrace Date: Wed, 4 Nov 2026 15:17:41 -0500 Message-ID: <20261104201802.11556-6-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-MFC-PROC-ID: jOeIcrhhqdAGbFh3xL55GZZoLD4vtSwx61M9KkBPrGw_1793823494 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-42698a/1793823501-AAEDE9EA-D4568A38/35/111497 X-purgate-type: clean X-purgate-size: 1132 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823537520158500 From: Daniel P. Berrang=C3=A9 dtrace (or at least systemtap's fake "dtrace" binary) complains about a syntax error due to use of "long int", as it wants a bare "long" type Enforce this when parsing the trace-events files. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-6-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- scripts/tracetool/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 61ba6f1ba8c..6ed7cdd6ce4 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -177,6 +177,11 @@ def out(*lines, **kwargs): =20 def validate_type(name): bits =3D name.split(" ") + + if "long" in bits and "int" in bits: + raise ValueError("Invalid use of 'int' typename in %s, " + "use 'long' alone" % name) + for bit in bits: bit =3D re.sub(r"\*", "", bit) if bit =3D=3D "": --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823694; cv=none; d=zohomail.com; s=zohoarc; b=KpcLxc5Hx19MAKPUGLSm9uxPL4cYxjSTRPxVi4jgk8fqhYY1Jj4Mc/fq2PDKWp5oHJs8yIouBQpaUQH7ZP+mH4f1xLXBc6pmZ2gS331mzga7pFlSWbBS8dL6nJbdiglby6GTqlyDGlQc1Ivrz4lsVESnCzEDzsCHZUXQfYaMCoY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823694; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8UH5nYrF7hB5atKv+0kCjyLnZFXkjL/Cltw+H/p8G/s=; b=Rr6hNk5JDTSnG5jKztuVvKV3CMrDBm4mEV9eflasKhYTPDbefl6oqv0UwqAHS/021sOn8R5se4aP5bC/vkq3SzGX6zlcMIGitwTtuaGNj6tj35pv9X+XYDgiwfWkISCnUC4yKAGvmXrVsVKYtIHEL1sM8zD6NdUrvgY7KscbbNw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1793823694589158.10123470552185; Wed, 4 Nov 2026 12:21:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRG-0006ws-NJ; Wed, 04 Nov 2026 15:18:32 -0500 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 1xOhRD-0006vu-1H for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xOhRA-00064L-EA for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:25 -0500 Received: from mx-prod-mc-01.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-84-QalMV7oEOzeCMKM3d8bdqg-1; Wed, 04 Nov 2026 15:18:18 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D5B5D195609D; Wed, 4 Nov 2026 20:18:15 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 36D281956089; Wed, 4 Nov 2026 20:18:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823503; 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=8UH5nYrF7hB5atKv+0kCjyLnZFXkjL/Cltw+H/p8G/s=; b=fGw6mLEcz66SiRKoDAphxJ6CzxEIqgCpHZHRwXW5xGwurjwClYCOXdxiqP4s1EJYZqDPHx nxv8BOu52NPuJ+GnLw9RC2C5aYmS+DifV4VWmHzvWQVrVZxuFoip1sZchHzmN631ApJ8Lb 8kmPrQ3k7p0i6jOHjHXfs5QUEILe/OM= X-MC-Unique: QalMV7oEOzeCMKM3d8bdqg-1 X-Mimecast-MFC-AGG-ID: QalMV7oEOzeCMKM3d8bdqg_1793823496 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 06/25] trace: drop unused trace_event_set_state_dynamic_init() Date: Wed, 4 Nov 2026 15:17:42 -0500 Message-ID: <20261104201802.11556-7-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823696415158500 From: Daniel P. Berrang=C3=A9 The use of this method was mistakenly dropped in 0d4e995c73. When the 'vcpu' property was dropped, however, this became functionally identical to trace_event_set_state_dynamic(). Fixes: 0d4e995c7368 ("trace: convert code to use event iterators") Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-7-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- trace/event-internal.h | 2 -- stubs/trace-control.c | 5 ----- trace/control-target.c | 21 --------------------- 3 files changed, 28 deletions(-) diff --git a/trace/event-internal.h b/trace/event-internal.h index 0c24e01b521..1d57b0ff1b5 100644 --- a/trace/event-internal.h +++ b/trace/event-internal.h @@ -37,6 +37,4 @@ typedef struct TraceEvent { uint16_t *dstate; } TraceEvent; =20 -void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state); - #endif /* TRACE__EVENT_INTERNAL_H */ diff --git a/stubs/trace-control.c b/stubs/trace-control.c index b428f34c878..3f196835db0 100644 --- a/stubs/trace-control.c +++ b/stubs/trace-control.c @@ -11,11 +11,6 @@ #include "trace/control.h" =20 =20 -void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state) -{ - trace_event_set_state_dynamic(ev, state); -} - void trace_event_set_state_dynamic(TraceEvent *ev, bool state) { bool state_pre; diff --git a/trace/control-target.c b/trace/control-target.c index 57ceac21084..24d9b7abbde 100644 --- a/trace/control-target.c +++ b/trace/control-target.c @@ -10,27 +10,6 @@ #include "qemu/osdep.h" #include "trace/control.h" =20 - -void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state) -{ - bool state_pre; - assert(trace_event_get_state_static(ev)); - /* - * We ignore the "vcpu" property here, since no vCPUs have been created - * yet. Then dstate can only be 1 or 0. - */ - state_pre =3D *ev->dstate; - if (state_pre !=3D state) { - if (state) { - trace_events_enabled_count++; - *ev->dstate =3D 1; - } else { - trace_events_enabled_count--; - *ev->dstate =3D 0; - } - } -} - void trace_event_set_state_dynamic(TraceEvent *ev, bool state) { assert(trace_event_get_state_static(ev)); --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1793823525; cv=none; d=zohomail.com; s=zohoarc; b=dVtKbjoKL5Q6xfk+/zko66sMpl8Ct3DQGjWHfD6COwBtPfIOqdCC7jy5XMRt3hi4FKrUUzeqTKeMiqd6jSI/bkMpG2pUWHgVRGv9p+wyHVajLts7WOaWpIfhffnYTzC0yz0BXHfHJUpCxNOpH3+uScmCskBwA2Zt1ZeA5T/FP6E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823525; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=s2fQy26Nzh4pevOCqiRqluICNBTrWSgxg/L8ugtFtns=; b=hh5PF3awzMFon+sx0T96RNpyBuEU3uB7w9e32pJYrFo6VSdCxMm554QCko0z57fdz65F9Wxrq43Ju/I9/IM+I2ELZFF2gyPT5g8CwhQlY9pF6FRXEs8nXz0MZO5U36xc4jUzipuvp5ys57pODpm9AJP3vdoMxcp7YnQLZ4Fl0yI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1793823525558631.962772320058; Wed, 4 Nov 2026 12:18:45 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1472517.1680384 (Exim 4.92) (envelope-from ) id 1xOhRC-0007uP-95; Wed, 04 Nov 2026 20:18:26 +0000 Received: by outflank-mailman (output) from mailman id 1472517.1680384; Wed, 04 Nov 2026 20:18:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRC-0007tB-28; Wed, 04 Nov 2026 20:18:26 +0000 Received: by outflank-mailman (input) for mailman id 1472517; Wed, 04 Nov 2026 20:18:25 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRA-0007O9-SN for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 20:18:24 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1xOhRA-007PCO-94 for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 21:18:24 +0100 Received: from [10.42.69.9] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6aeb92f6-e002-0a2a0a5209dd-0a2a4509bbbc-44 for ; Wed, 04 Nov 2026 21:18:24 +0100 Received: from [170.10.133.124] (helo=us-smtp-delivery-124.mimecast.com) by tlsNG-bad1c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6aeb930f-be1a-0a2a45090019-aa0a857ce6fb-3 for ; Wed, 04 Nov 2026 21:18:24 +0100 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-94-mjBi57jdNC6N6sRwpfIbiA-1; Wed, 04 Nov 2026 15:18:19 -0500 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 63BDD1800542; Wed, 4 Nov 2026 20:18:17 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CE7E8301D916; Wed, 4 Nov 2026 20:18:16 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=mimecast20190719 header.d=redhat.com header.i="@redhat.com" header.h="From:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823503; 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=s2fQy26Nzh4pevOCqiRqluICNBTrWSgxg/L8ugtFtns=; b=DkZlVMzT8xvU4Ak5SavTGHhHNw1gXHxOA6p9+JQiKGH55awodDEQpPtyVEuP9baCB5wrWh BT7NSDMUAcPULIN0cQtzqcWgiIsWANkK6ZNE8i/F6KHnFztR9ma/FBv4SyorEcik2K6AUi 9N4aLnGM91v1v6nLQ11XV6Ro9KeYrBw= X-MC-Unique: mjBi57jdNC6N6sRwpfIbiA-1 X-Mimecast-MFC-AGG-ID: mjBi57jdNC6N6sRwpfIbiA_1793823497 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL v2 07/25] trace: remove obsolete references to vcpu property Date: Wed, 4 Nov 2026 15:17:43 -0500 Message-ID: <20261104201802.11556-8-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-MFC-PROC-ID: wQCs9WlhuiLLZJEe648mq-LKD63sc5iiQ_lk14WmhtY_1793823497 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-bad1c0/1793823504-FC817034-7B5B5309/35/111497 X-purgate-type: clean X-purgate-size: 4069 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823527342158500 From: Daniel P. Berrang=C3=A9 The 'vcpu' property for trace events was removed 2 years ago but some mentions of it remain in the code. Fixes: 7ffc4894a63b ("trace: Remove deprecated 'vcpu' field from QMP trace = events") Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-8-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- trace/control.h | 12 ------------ trace/event-internal.h | 11 ----------- trace/control-target.c | 6 ------ trace/control.c | 6 ------ 4 files changed, 35 deletions(-) diff --git a/trace/control.h b/trace/control.h index 6754bfe052b..20033fb6669 100644 --- a/trace/control.h +++ b/trace/control.h @@ -139,8 +139,6 @@ static bool trace_event_get_state_static(TraceEvent *ev= ); * trace_event_get_state_dynamic: * * Get the dynamic tracing state of an event. - * - * If the event has the 'vcpu' property, gets the OR'ed state of all vCPUs. */ static bool trace_event_get_state_dynamic(TraceEvent *ev); =20 @@ -149,8 +147,6 @@ static bool trace_event_get_state_dynamic(TraceEvent *e= v); * * Set the dynamic tracing state of an event. * - * If the event has the 'vcpu' property, sets the state on all vCPUs. - * * Pre-condition: trace_event_get_state_static(ev) =3D=3D true */ void trace_event_set_state_dynamic(TraceEvent *ev, bool state); @@ -203,14 +199,6 @@ extern QemuOptsList qemu_trace_opts; */ void trace_opt_parse(const char *optstr); =20 -/** - * trace_get_vcpu_event_count: - * - * Return the number of known vcpu-specific events - */ -uint32_t trace_get_vcpu_event_count(void); - - #include "control-internal.h" =20 #endif /* TRACE__CONTROL_H */ diff --git a/trace/event-internal.h b/trace/event-internal.h index 1d57b0ff1b5..cc095a6ad54 100644 --- a/trace/event-internal.h +++ b/trace/event-internal.h @@ -10,12 +10,6 @@ #ifndef TRACE__EVENT_INTERNAL_H #define TRACE__EVENT_INTERNAL_H =20 -/* - * Special value for TraceEvent.vcpu_id field to indicate - * that the event is not VCPU specific - */ -#define TRACE_VCPU_EVENT_NONE ((uint32_t)-1) - /** * TraceEvent: * @id: Unique event identifier. @@ -23,11 +17,6 @@ * @sstate: Static tracing state. * @dstate: Dynamic tracing state * - * Interpretation of @dstate depends on whether the event has the 'vcpu' - * property: - * - false: Boolean value indicating whether the event is active. - * - true : Integral counting the number of vCPUs that have this event ena= bled. - * * Opaque generic description of a tracing event. */ typedef struct TraceEvent { diff --git a/trace/control-target.c b/trace/control-target.c index 24d9b7abbde..87b0f5037df 100644 --- a/trace/control-target.c +++ b/trace/control-target.c @@ -14,12 +14,6 @@ void trace_event_set_state_dynamic(TraceEvent *ev, bool = state) { assert(trace_event_get_state_static(ev)); =20 - /* - * There is no longer a "vcpu" property, dstate can only be 1 or - * 0. With it, we haven't instantiated any vCPU yet, so we will - * set a global state instead, and trace_init_vcpu will reconcile - * it afterwards. - */ bool state_pre =3D *ev->dstate; if (state_pre !=3D state) { if (state) { diff --git a/trace/control.c b/trace/control.c index 49f0a4c5cda..6971157cbe7 100644 --- a/trace/control.c +++ b/trace/control.c @@ -37,7 +37,6 @@ typedef struct TraceEventGroup { static TraceEventGroup *event_groups; static size_t nevent_groups; static uint32_t next_id; -static uint32_t next_vcpu_id; #ifdef CONFIG_TRACE_SIMPLE static bool init_trace_on_startup; #endif @@ -304,8 +303,3 @@ void trace_opt_parse(const char *optstr) trace_opts_file =3D g_strdup(qemu_opt_get(opts, "file")); qemu_opts_del(opts); } - -uint32_t trace_get_vcpu_event_count(void) -{ - return next_vcpu_id; -} --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1793823529; cv=none; d=zohomail.com; s=zohoarc; b=Qqi5PoJV8qGrQ2Hnvpe3NrdA+yUW28U/FkboVPiMe7hSr5PTb2ezX00s09U4KrihpGUKKTJQxrK4wS20G0e7u3rMTfpEEfgUnZ9rJGJtHKtx01OCqqqtcAqjLVO49lookvS+NFfT1y/Si6Ydg0rqnybLaKIzN8Hv+GV4uLZ93gU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823529; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1+Fb/pNuDVJKjUmAlJEVqK84jM77qkTAumiP1SiO8JU=; b=H1ORYEHB6L1YSmhRpyBm7fftNnfmNcFdEtPolszowlYz3Z+j6zxLgQbQbL38knJ6PSjqM3SwWjrpmjbVSuICbdIl0/LeVwTvSonJdb3GeB0i0Q+oiO57fF9r7zAGDwg9YW7CCtFVnWTnUM38gQGBx5O14o4Lh2zKtsLPj14BtZg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1793823529850834.5783415801794; Wed, 4 Nov 2026 12:18:49 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1472521.1680401 (Exim 4.92) (envelope-from ) id 1xOhRF-0008RE-Ux; Wed, 04 Nov 2026 20:18:29 +0000 Received: by outflank-mailman (output) from mailman id 1472521.1680401; Wed, 04 Nov 2026 20:18:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRF-0008Pz-Nq; Wed, 04 Nov 2026 20:18:29 +0000 Received: by outflank-mailman (input) for mailman id 1472521; Wed, 04 Nov 2026 20:18:27 +0000 Received: from mx.expurgate.net ([194.145.224.20]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRD-0008Is-QG for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 20:18:27 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1xOhRD-00BuCu-7K for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 21:18:27 +0100 Received: from [10.42.69.10] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6aeb9305-2eae-0a2a0a5409dd-0a2a450acd02-14 for ; Wed, 04 Nov 2026 21:18:27 +0100 Received: from [170.10.129.124] (helo=us-smtp-delivery-124.mimecast.com) by tlsNG-4011c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6aeb9311-f2d2-0a2a450a0019-aa0a817cddd5-3 for ; Wed, 04 Nov 2026 21:18:27 +0100 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-399-h-2ICopVPpm5iXv0ERIT1A-1; Wed, 04 Nov 2026 15:18:20 -0500 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BC28818003FD; Wed, 4 Nov 2026 20:18:18 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 66A0F26C; Wed, 4 Nov 2026 20:18:18 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=mimecast20190719 header.d=redhat.com header.i="@redhat.com" header.h="From:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823505; 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=1+Fb/pNuDVJKjUmAlJEVqK84jM77qkTAumiP1SiO8JU=; b=DRENEx/2pmI70rkqwflSY87z7ZvWlmReXZeIhEAcaHaK1IRWMDIa+a7b3DazBlirDRS/uw dDp7mXhFG+hosjeg/cKrCy1DhjLCS3zllHKp1ZjJ6ATVoLL42cCK6sKY3gjfFwE/sJ2062 gEF/RsYLZCgAqkB3b6nyrEtO15FCOaM= X-MC-Unique: h-2ICopVPpm5iXv0ERIT1A-1 X-Mimecast-MFC-AGG-ID: h-2ICopVPpm5iXv0ERIT1A_1793823499 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 08/25] trace: drop 'id' from TraceEvent struct when not required Date: Wed, 4 Nov 2026 15:17:44 -0500 Message-ID: <20261104201802.11556-9-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 X-Mimecast-MFC-PROC-ID: _Mj7Yljal7Dx5mIS5YZoK_ldI0DY9LqjqSZqNvq2NUw_1793823499 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-4011c0/1793823507-595C3CFC-FC3E2BE1/35/111497 X-purgate-type: clean X-purgate-size: 7751 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823531471158500 From: Daniel P. Berrang=C3=A9 Only "simpletrace" uses the "id" field from the TraceEvent struct. Omit it when this backend is not enabled to save memory. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-9-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- trace/control-internal.h | 2 ++ trace/control.h | 3 ++- trace/event-internal.h | 2 ++ tests/tracetool/dtrace.c | 4 ++++ tests/tracetool/ftrace.c | 4 ++++ tests/tracetool/log.c | 4 ++++ tests/tracetool/simple.c | 4 ++++ tests/tracetool/syslog.c | 4 ++++ tests/tracetool/ust.c | 4 ++++ trace/control.c | 4 +++- scripts/tracetool/format/c.py | 2 ++ 11 files changed, 35 insertions(+), 2 deletions(-) diff --git a/trace/control-internal.h b/trace/control-internal.h index 8d818d359be..f626b047264 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -19,11 +19,13 @@ static inline bool trace_event_is_pattern(const char *s= tr) return strchr(str, '*') !=3D NULL; } =20 +#ifdef CONFIG_TRACE_SIMPLE static inline uint32_t trace_event_get_id(TraceEvent *ev) { assert(ev !=3D NULL); return ev->id; } +#endif =20 static inline const char * trace_event_get_name(TraceEvent *ev) { diff --git a/trace/control.h b/trace/control.h index 20033fb6669..e77c07a8e68 100644 --- a/trace/control.h +++ b/trace/control.h @@ -81,13 +81,14 @@ TraceEvent *trace_event_name(const char *name); */ static bool trace_event_is_pattern(const char *str); =20 - +#ifdef CONFIG_TRACE_SIMPLE /** * trace_event_get_id: * * Get the identifier of an event. */ static uint32_t trace_event_get_id(TraceEvent *ev); +#endif =20 /** * trace_event_get_name: diff --git a/trace/event-internal.h b/trace/event-internal.h index cc095a6ad54..ecf2caabd03 100644 --- a/trace/event-internal.h +++ b/trace/event-internal.h @@ -20,7 +20,9 @@ * Opaque generic description of a tracing event. */ typedef struct TraceEvent { +#ifdef CONFIG_TRACE_SIMPLE uint32_t id; +#endif const char * name; const bool sstate; uint16_t *dstate; diff --git a/tests/tracetool/dtrace.c b/tests/tracetool/dtrace.c index 9f862fa14d2..05a93918240 100644 --- a/tests/tracetool/dtrace.c +++ b/tests/tracetool/dtrace.c @@ -8,13 +8,17 @@ uint16_t _TRACE_TEST_BLAH_DSTATE; uint16_t _TRACE_TEST_WIBBLE_DSTATE; TraceEvent _TRACE_TEST_BLAH_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE .id =3D 0, +#endif .name =3D "test_blah", .sstate =3D TRACE_TEST_BLAH_ENABLED, .dstate =3D &_TRACE_TEST_BLAH_DSTATE }; TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE .id =3D 0, +#endif .name =3D "test_wibble", .sstate =3D TRACE_TEST_WIBBLE_ENABLED, .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE diff --git a/tests/tracetool/ftrace.c b/tests/tracetool/ftrace.c index 9f862fa14d2..05a93918240 100644 --- a/tests/tracetool/ftrace.c +++ b/tests/tracetool/ftrace.c @@ -8,13 +8,17 @@ uint16_t _TRACE_TEST_BLAH_DSTATE; uint16_t _TRACE_TEST_WIBBLE_DSTATE; TraceEvent _TRACE_TEST_BLAH_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE .id =3D 0, +#endif .name =3D "test_blah", .sstate =3D TRACE_TEST_BLAH_ENABLED, .dstate =3D &_TRACE_TEST_BLAH_DSTATE }; TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE .id =3D 0, +#endif .name =3D "test_wibble", .sstate =3D TRACE_TEST_WIBBLE_ENABLED, .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE diff --git a/tests/tracetool/log.c b/tests/tracetool/log.c index 9f862fa14d2..05a93918240 100644 --- a/tests/tracetool/log.c +++ b/tests/tracetool/log.c @@ -8,13 +8,17 @@ uint16_t _TRACE_TEST_BLAH_DSTATE; uint16_t _TRACE_TEST_WIBBLE_DSTATE; TraceEvent _TRACE_TEST_BLAH_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE .id =3D 0, +#endif .name =3D "test_blah", .sstate =3D TRACE_TEST_BLAH_ENABLED, .dstate =3D &_TRACE_TEST_BLAH_DSTATE }; TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE .id =3D 0, +#endif .name =3D "test_wibble", .sstate =3D TRACE_TEST_WIBBLE_ENABLED, .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE diff --git a/tests/tracetool/simple.c b/tests/tracetool/simple.c index 0484177481c..490d6f379a5 100644 --- a/tests/tracetool/simple.c +++ b/tests/tracetool/simple.c @@ -8,13 +8,17 @@ uint16_t _TRACE_TEST_BLAH_DSTATE; uint16_t _TRACE_TEST_WIBBLE_DSTATE; TraceEvent _TRACE_TEST_BLAH_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE .id =3D 0, +#endif .name =3D "test_blah", .sstate =3D TRACE_TEST_BLAH_ENABLED, .dstate =3D &_TRACE_TEST_BLAH_DSTATE }; TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE .id =3D 0, +#endif .name =3D "test_wibble", .sstate =3D TRACE_TEST_WIBBLE_ENABLED, .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE diff --git a/tests/tracetool/syslog.c b/tests/tracetool/syslog.c index 9f862fa14d2..05a93918240 100644 --- a/tests/tracetool/syslog.c +++ b/tests/tracetool/syslog.c @@ -8,13 +8,17 @@ uint16_t _TRACE_TEST_BLAH_DSTATE; uint16_t _TRACE_TEST_WIBBLE_DSTATE; TraceEvent _TRACE_TEST_BLAH_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE .id =3D 0, +#endif .name =3D "test_blah", .sstate =3D TRACE_TEST_BLAH_ENABLED, .dstate =3D &_TRACE_TEST_BLAH_DSTATE }; TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE .id =3D 0, +#endif .name =3D "test_wibble", .sstate =3D TRACE_TEST_WIBBLE_ENABLED, .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE diff --git a/tests/tracetool/ust.c b/tests/tracetool/ust.c index 9f862fa14d2..05a93918240 100644 --- a/tests/tracetool/ust.c +++ b/tests/tracetool/ust.c @@ -8,13 +8,17 @@ uint16_t _TRACE_TEST_BLAH_DSTATE; uint16_t _TRACE_TEST_WIBBLE_DSTATE; TraceEvent _TRACE_TEST_BLAH_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE .id =3D 0, +#endif .name =3D "test_blah", .sstate =3D TRACE_TEST_BLAH_ENABLED, .dstate =3D &_TRACE_TEST_BLAH_DSTATE }; TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE .id =3D 0, +#endif .name =3D "test_wibble", .sstate =3D TRACE_TEST_WIBBLE_ENABLED, .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE diff --git a/trace/control.c b/trace/control.c index 6971157cbe7..947b220056a 100644 --- a/trace/control.c +++ b/trace/control.c @@ -36,8 +36,8 @@ typedef struct TraceEventGroup { =20 static TraceEventGroup *event_groups; static size_t nevent_groups; -static uint32_t next_id; #ifdef CONFIG_TRACE_SIMPLE +static uint32_t next_id; static bool init_trace_on_startup; #endif static char *trace_opts_file; @@ -65,10 +65,12 @@ QemuOptsList qemu_trace_opts =3D { =20 void trace_event_register_group(TraceEvent **events) { +#ifdef CONFIG_TRACE_SIMPLE size_t i; for (i =3D 0; events[i] !=3D NULL; i++) { events[i]->id =3D next_id++; } +#endif event_groups =3D g_renew(TraceEventGroup, event_groups, nevent_groups = + 1); event_groups[nevent_groups].events =3D events; nevent_groups++; diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py index 50e03313cbf..abe738ac423 100644 --- a/scripts/tracetool/format/c.py +++ b/scripts/tracetool/format/c.py @@ -34,7 +34,9 @@ def generate(events, backend, group): =20 for e in events: out('TraceEvent %(event)s =3D {', + '#ifdef CONFIG_TRACE_SIMPLE', ' .id =3D 0,', + '#endif', ' .name =3D \"%(name)s\",', ' .sstate =3D %(sstate)s,', ' .dstate =3D &%(dstate)s', --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823703; cv=none; d=zohomail.com; s=zohoarc; b=YIcFbUnkxghphVZsUJsZX4MNjZWxKxF457vh8nDW0ghaq5Dm50aIRqXqfwUkS26JprrlXFb7BCbF/kv65GuRnE+0h6zvXFzQxk1qOZa3Q/JrUAYKkG49L3kg4ykK7MQKYlN4KmARRmFC9IVvMB8UEf//vO+kMo2L8NbvswJlWWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823703; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DFGAhqQ+xaxqaeHjSPXfZYHtf1rW7LNoujQ+nr96Ekg=; b=PfkHrc9p1fIIeBax5fT7TxaHHBSuw5//INObqT5vUv53TlRPmth83q72j5vz1fo6UXqcmeVrhSRnlsJyWiiqbUQ7MqZmKNibss8rATF+NNSbfGjMEG444ZjMokFGqDpo++Kv28KhlRJOs7U5kS+Il7wutQM0Z/mB+vWZEx2ccgU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1793823703642968.3927826666645; Wed, 4 Nov 2026 12:21:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRW-00072y-UW; Wed, 04 Nov 2026 15:18:47 -0500 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 1xOhRF-0006wu-TB for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:30 -0500 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 1xOhRD-00064o-Av for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:29 -0500 Received: from mx-prod-mc-01.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-211-O9dhJazzNeeykFcfvJtPlA-1; Wed, 04 Nov 2026 15:18:22 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5A91219560B2; Wed, 4 Nov 2026 20:18:20 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CE1A4195604C; Wed, 4 Nov 2026 20:18:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823506; 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=DFGAhqQ+xaxqaeHjSPXfZYHtf1rW7LNoujQ+nr96Ekg=; b=MGtU+7N+uApzMRjcsXEWKTL4sSNGE6DQx+cJzXtDVlqmVwegA4x8xpOV3AwpJW8KJz7cvU 9Oe+yupGaQVW/Hge+iMYyl8g+2OnbY5tZS0sUxLvjPqvGBkZ0fjVXvYlCvB6x/I+AAyVFQ SzF8M7tiM/R4unDayrYQwe20ksE4Cr4= X-MC-Unique: O9dhJazzNeeykFcfvJtPlA-1 X-Mimecast-MFC-AGG-ID: O9dhJazzNeeykFcfvJtPlA_1793823500 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 09/25] trace: change "DSTATE" variables from uint16_t to uint8_t Date: Wed, 4 Nov 2026 15:17:45 -0500 Message-ID: <20261104201802.11556-10-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823704689158500 From: Daniel P. Berrang=C3=A9 Previously these variables had two distinct semantics. For most probes DSTATE was treated as a simple boolean, while for vcpu probes it was treated as a bitmask of vCPU indexes. With vcpu probes removed, it is now exclusively a boolean and thus using uint16_t is a waste of memory. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-10-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- tests/tracetool/dtrace.h | 4 ++-- tests/tracetool/ftrace.h | 4 ++-- tests/tracetool/log.h | 4 ++-- tests/tracetool/simple.h | 4 ++-- tests/tracetool/syslog.h | 4 ++-- tests/tracetool/ust.h | 4 ++-- trace/event-internal.h | 2 +- tests/tracetool/dtrace.c | 4 ++-- tests/tracetool/ftrace.c | 4 ++-- tests/tracetool/log.c | 4 ++-- tests/tracetool/simple.c | 4 ++-- tests/tracetool/syslog.c | 4 ++-- tests/tracetool/ust.c | 4 ++-- scripts/tracetool/format/c.py | 2 +- scripts/tracetool/format/h.py | 2 +- scripts/tracetool/format/rs.py | 4 ++-- tests/tracetool/dtrace.rs | 6 +++--- tests/tracetool/ftrace.rs | 6 +++--- tests/tracetool/log.rs | 6 +++--- tests/tracetool/simple.rs | 6 +++--- tests/tracetool/syslog.rs | 6 +++--- 21 files changed, 44 insertions(+), 44 deletions(-) diff --git a/tests/tracetool/dtrace.h b/tests/tracetool/dtrace.h index c8931a8d7b3..0b5b47089e8 100644 --- a/tests/tracetool/dtrace.h +++ b/tests/tracetool/dtrace.h @@ -8,8 +8,8 @@ =20 extern TraceEvent _TRACE_TEST_BLAH_EVENT; extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; -extern uint16_t _TRACE_TEST_BLAH_DSTATE; -extern uint16_t _TRACE_TEST_WIBBLE_DSTATE; +extern uint8_t _TRACE_TEST_BLAH_DSTATE; +extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; #define TRACE_TEST_BLAH_ENABLED 1 #define TRACE_TEST_WIBBLE_ENABLED 1 #ifndef SDT_USE_VARIADIC diff --git a/tests/tracetool/ftrace.h b/tests/tracetool/ftrace.h index 1dfe4239413..b34eef17d10 100644 --- a/tests/tracetool/ftrace.h +++ b/tests/tracetool/ftrace.h @@ -8,8 +8,8 @@ =20 extern TraceEvent _TRACE_TEST_BLAH_EVENT; extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; -extern uint16_t _TRACE_TEST_BLAH_DSTATE; -extern uint16_t _TRACE_TEST_WIBBLE_DSTATE; +extern uint8_t _TRACE_TEST_BLAH_DSTATE; +extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; #define TRACE_TEST_BLAH_ENABLED 1 #define TRACE_TEST_WIBBLE_ENABLED 1 #include "trace/ftrace.h" diff --git a/tests/tracetool/log.h b/tests/tracetool/log.h index c7795871f85..ff510d54908 100644 --- a/tests/tracetool/log.h +++ b/tests/tracetool/log.h @@ -8,8 +8,8 @@ =20 extern TraceEvent _TRACE_TEST_BLAH_EVENT; extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; -extern uint16_t _TRACE_TEST_BLAH_DSTATE; -extern uint16_t _TRACE_TEST_WIBBLE_DSTATE; +extern uint8_t _TRACE_TEST_BLAH_DSTATE; +extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; #define TRACE_TEST_BLAH_ENABLED 1 #define TRACE_TEST_WIBBLE_ENABLED 1 #include "qemu/log-for-trace.h" diff --git a/tests/tracetool/simple.h b/tests/tracetool/simple.h index ec6fcb22c3c..735cb21d911 100644 --- a/tests/tracetool/simple.h +++ b/tests/tracetool/simple.h @@ -8,8 +8,8 @@ =20 extern TraceEvent _TRACE_TEST_BLAH_EVENT; extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; -extern uint16_t _TRACE_TEST_BLAH_DSTATE; -extern uint16_t _TRACE_TEST_WIBBLE_DSTATE; +extern uint8_t _TRACE_TEST_BLAH_DSTATE; +extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; #define TRACE_TEST_BLAH_ENABLED 1 #define TRACE_TEST_WIBBLE_ENABLED 1 void _simple_trace_test_blah(void *context, const char *filename); diff --git a/tests/tracetool/syslog.h b/tests/tracetool/syslog.h index ed4305554c1..4203b8b37dc 100644 --- a/tests/tracetool/syslog.h +++ b/tests/tracetool/syslog.h @@ -8,8 +8,8 @@ =20 extern TraceEvent _TRACE_TEST_BLAH_EVENT; extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; -extern uint16_t _TRACE_TEST_BLAH_DSTATE; -extern uint16_t _TRACE_TEST_WIBBLE_DSTATE; +extern uint8_t _TRACE_TEST_BLAH_DSTATE; +extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; #define TRACE_TEST_BLAH_ENABLED 1 #define TRACE_TEST_WIBBLE_ENABLED 1 #include diff --git a/tests/tracetool/ust.h b/tests/tracetool/ust.h index b7acd0c39b1..079b2c74491 100644 --- a/tests/tracetool/ust.h +++ b/tests/tracetool/ust.h @@ -8,8 +8,8 @@ =20 extern TraceEvent _TRACE_TEST_BLAH_EVENT; extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; -extern uint16_t _TRACE_TEST_BLAH_DSTATE; -extern uint16_t _TRACE_TEST_WIBBLE_DSTATE; +extern uint8_t _TRACE_TEST_BLAH_DSTATE; +extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; #define TRACE_TEST_BLAH_ENABLED 1 #define TRACE_TEST_WIBBLE_ENABLED 1 #include diff --git a/trace/event-internal.h b/trace/event-internal.h index ecf2caabd03..ad1578aa2c5 100644 --- a/trace/event-internal.h +++ b/trace/event-internal.h @@ -25,7 +25,7 @@ typedef struct TraceEvent { #endif const char * name; const bool sstate; - uint16_t *dstate; + uint8_t *dstate; } TraceEvent; =20 #endif /* TRACE__EVENT_INTERNAL_H */ diff --git a/tests/tracetool/dtrace.c b/tests/tracetool/dtrace.c index 05a93918240..f83d06252ea 100644 --- a/tests/tracetool/dtrace.c +++ b/tests/tracetool/dtrace.c @@ -5,8 +5,8 @@ #include "qemu/module.h" #include "trace-testsuite.h" =20 -uint16_t _TRACE_TEST_BLAH_DSTATE; -uint16_t _TRACE_TEST_WIBBLE_DSTATE; +uint8_t _TRACE_TEST_BLAH_DSTATE; +uint8_t _TRACE_TEST_WIBBLE_DSTATE; TraceEvent _TRACE_TEST_BLAH_EVENT =3D { #ifdef CONFIG_TRACE_SIMPLE .id =3D 0, diff --git a/tests/tracetool/ftrace.c b/tests/tracetool/ftrace.c index 05a93918240..f83d06252ea 100644 --- a/tests/tracetool/ftrace.c +++ b/tests/tracetool/ftrace.c @@ -5,8 +5,8 @@ #include "qemu/module.h" #include "trace-testsuite.h" =20 -uint16_t _TRACE_TEST_BLAH_DSTATE; -uint16_t _TRACE_TEST_WIBBLE_DSTATE; +uint8_t _TRACE_TEST_BLAH_DSTATE; +uint8_t _TRACE_TEST_WIBBLE_DSTATE; TraceEvent _TRACE_TEST_BLAH_EVENT =3D { #ifdef CONFIG_TRACE_SIMPLE .id =3D 0, diff --git a/tests/tracetool/log.c b/tests/tracetool/log.c index 05a93918240..f83d06252ea 100644 --- a/tests/tracetool/log.c +++ b/tests/tracetool/log.c @@ -5,8 +5,8 @@ #include "qemu/module.h" #include "trace-testsuite.h" =20 -uint16_t _TRACE_TEST_BLAH_DSTATE; -uint16_t _TRACE_TEST_WIBBLE_DSTATE; +uint8_t _TRACE_TEST_BLAH_DSTATE; +uint8_t _TRACE_TEST_WIBBLE_DSTATE; TraceEvent _TRACE_TEST_BLAH_EVENT =3D { #ifdef CONFIG_TRACE_SIMPLE .id =3D 0, diff --git a/tests/tracetool/simple.c b/tests/tracetool/simple.c index 490d6f379a5..820ddb575b0 100644 --- a/tests/tracetool/simple.c +++ b/tests/tracetool/simple.c @@ -5,8 +5,8 @@ #include "qemu/module.h" #include "trace-testsuite.h" =20 -uint16_t _TRACE_TEST_BLAH_DSTATE; -uint16_t _TRACE_TEST_WIBBLE_DSTATE; +uint8_t _TRACE_TEST_BLAH_DSTATE; +uint8_t _TRACE_TEST_WIBBLE_DSTATE; TraceEvent _TRACE_TEST_BLAH_EVENT =3D { #ifdef CONFIG_TRACE_SIMPLE .id =3D 0, diff --git a/tests/tracetool/syslog.c b/tests/tracetool/syslog.c index 05a93918240..f83d06252ea 100644 --- a/tests/tracetool/syslog.c +++ b/tests/tracetool/syslog.c @@ -5,8 +5,8 @@ #include "qemu/module.h" #include "trace-testsuite.h" =20 -uint16_t _TRACE_TEST_BLAH_DSTATE; -uint16_t _TRACE_TEST_WIBBLE_DSTATE; +uint8_t _TRACE_TEST_BLAH_DSTATE; +uint8_t _TRACE_TEST_WIBBLE_DSTATE; TraceEvent _TRACE_TEST_BLAH_EVENT =3D { #ifdef CONFIG_TRACE_SIMPLE .id =3D 0, diff --git a/tests/tracetool/ust.c b/tests/tracetool/ust.c index 05a93918240..f83d06252ea 100644 --- a/tests/tracetool/ust.c +++ b/tests/tracetool/ust.c @@ -5,8 +5,8 @@ #include "qemu/module.h" #include "trace-testsuite.h" =20 -uint16_t _TRACE_TEST_BLAH_DSTATE; -uint16_t _TRACE_TEST_WIBBLE_DSTATE; +uint8_t _TRACE_TEST_BLAH_DSTATE; +uint8_t _TRACE_TEST_WIBBLE_DSTATE; TraceEvent _TRACE_TEST_BLAH_EVENT =3D { #ifdef CONFIG_TRACE_SIMPLE .id =3D 0, diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py index abe738ac423..de1c154a881 100644 --- a/scripts/tracetool/format/c.py +++ b/scripts/tracetool/format/c.py @@ -30,7 +30,7 @@ def generate(events, backend, group): '') =20 for e in events: - out('uint16_t %s;' % e.api(e.QEMU_DSTATE)) + out('uint8_t %s;' % e.api(e.QEMU_DSTATE)) =20 for e in events: out('TraceEvent %(event)s =3D {', diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index dd58713a158..4dc1ad7eb15 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -32,7 +32,7 @@ def generate(events, backend, group): event =3D e.api(e.QEMU_EVENT)) =20 for e in events: - out('extern uint16_t %s;' % e.api(e.QEMU_DSTATE)) + out('extern uint8_t %s;' % e.api(e.QEMU_DSTATE)) =20 # static state for e in events: diff --git a/scripts/tracetool/format/rs.py b/scripts/tracetool/format/rs.py index 7d9af7edfee..1fddcee1ad2 100644 --- a/scripts/tracetool/format/rs.py +++ b/scripts/tracetool/format/rs.py @@ -26,7 +26,7 @@ def generate(events, backend, group): '', '#[allow(dead_code)]', '#[inline(always)]', - 'fn trace_event_state_is_enabled(dstate: u16) -> bool {', + 'fn trace_event_state_is_enabled(dstate: u8) -> bool {', ' (unsafe { trace_events_enabled_count }) !=3D 0 && dstate !=3D= 0', '}', '', @@ -39,7 +39,7 @@ def generate(events, backend, group): =20 for e in events: out(' #[allow(dead_code)]', - ' static mut %s: u16;' % e.api(e.QEMU_DSTATE)) + ' static mut %s: u8;' % e.api(e.QEMU_DSTATE)) out('}', '') =20 diff --git a/tests/tracetool/dtrace.rs b/tests/tracetool/dtrace.rs index 3490fcb271a..07398f4731b 100644 --- a/tests/tracetool/dtrace.rs +++ b/tests/tracetool/dtrace.rs @@ -8,7 +8,7 @@ =20 #[allow(dead_code)] #[inline(always)] -fn trace_event_state_is_enabled(dstate: u16) -> bool { +fn trace_event_state_is_enabled(dstate: u8) -> bool { (unsafe { trace_events_enabled_count }) !=3D 0 && dstate !=3D 0 } =20 @@ -18,9 +18,9 @@ fn trace_event_state_is_enabled(dstate: u16) -> bool { } extern "C" { #[allow(dead_code)] - static mut _TRACE_TEST_BLAH_DSTATE: u16; + static mut _TRACE_TEST_BLAH_DSTATE: u8; #[allow(dead_code)] - static mut _TRACE_TEST_WIBBLE_DSTATE: u16; + static mut _TRACE_TEST_WIBBLE_DSTATE: u8; } =20 use std::cell::UnsafeCell; diff --git a/tests/tracetool/ftrace.rs b/tests/tracetool/ftrace.rs index 34f66004902..ff0bcde4b8b 100644 --- a/tests/tracetool/ftrace.rs +++ b/tests/tracetool/ftrace.rs @@ -8,7 +8,7 @@ =20 #[allow(dead_code)] #[inline(always)] -fn trace_event_state_is_enabled(dstate: u16) -> bool { +fn trace_event_state_is_enabled(dstate: u8) -> bool { (unsafe { trace_events_enabled_count }) !=3D 0 && dstate !=3D 0 } =20 @@ -18,9 +18,9 @@ fn trace_event_state_is_enabled(dstate: u16) -> bool { } extern "C" { #[allow(dead_code)] - static mut _TRACE_TEST_BLAH_DSTATE: u16; + static mut _TRACE_TEST_BLAH_DSTATE: u8; #[allow(dead_code)] - static mut _TRACE_TEST_WIBBLE_DSTATE: u16; + static mut _TRACE_TEST_WIBBLE_DSTATE: u8; } =20 #[inline(always)] diff --git a/tests/tracetool/log.rs b/tests/tracetool/log.rs index 770758611d1..0f052bb2c9c 100644 --- a/tests/tracetool/log.rs +++ b/tests/tracetool/log.rs @@ -8,7 +8,7 @@ =20 #[allow(dead_code)] #[inline(always)] -fn trace_event_state_is_enabled(dstate: u16) -> bool { +fn trace_event_state_is_enabled(dstate: u8) -> bool { (unsafe { trace_events_enabled_count }) !=3D 0 && dstate !=3D 0 } =20 @@ -18,9 +18,9 @@ fn trace_event_state_is_enabled(dstate: u16) -> bool { } extern "C" { #[allow(dead_code)] - static mut _TRACE_TEST_BLAH_DSTATE: u16; + static mut _TRACE_TEST_BLAH_DSTATE: u8; #[allow(dead_code)] - static mut _TRACE_TEST_WIBBLE_DSTATE: u16; + static mut _TRACE_TEST_WIBBLE_DSTATE: u8; } =20 #[inline(always)] diff --git a/tests/tracetool/simple.rs b/tests/tracetool/simple.rs index 92f896ef178..976feddde5b 100644 --- a/tests/tracetool/simple.rs +++ b/tests/tracetool/simple.rs @@ -8,7 +8,7 @@ =20 #[allow(dead_code)] #[inline(always)] -fn trace_event_state_is_enabled(dstate: u16) -> bool { +fn trace_event_state_is_enabled(dstate: u8) -> bool { (unsafe { trace_events_enabled_count }) !=3D 0 && dstate !=3D 0 } =20 @@ -18,9 +18,9 @@ fn trace_event_state_is_enabled(dstate: u16) -> bool { } extern "C" { #[allow(dead_code)] - static mut _TRACE_TEST_BLAH_DSTATE: u16; + static mut _TRACE_TEST_BLAH_DSTATE: u8; #[allow(dead_code)] - static mut _TRACE_TEST_WIBBLE_DSTATE: u16; + static mut _TRACE_TEST_WIBBLE_DSTATE: u8; } =20 #[inline(always)] diff --git a/tests/tracetool/syslog.rs b/tests/tracetool/syslog.rs index 378d03d34b2..9688dac84a5 100644 --- a/tests/tracetool/syslog.rs +++ b/tests/tracetool/syslog.rs @@ -8,7 +8,7 @@ =20 #[allow(dead_code)] #[inline(always)] -fn trace_event_state_is_enabled(dstate: u16) -> bool { +fn trace_event_state_is_enabled(dstate: u8) -> bool { (unsafe { trace_events_enabled_count }) !=3D 0 && dstate !=3D 0 } =20 @@ -18,9 +18,9 @@ fn trace_event_state_is_enabled(dstate: u16) -> bool { } extern "C" { #[allow(dead_code)] - static mut _TRACE_TEST_BLAH_DSTATE: u16; + static mut _TRACE_TEST_BLAH_DSTATE: u8; #[allow(dead_code)] - static mut _TRACE_TEST_WIBBLE_DSTATE: u16; + static mut _TRACE_TEST_WIBBLE_DSTATE: u8; } =20 #[inline(always)] --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1793823541; cv=none; d=zohomail.com; s=zohoarc; b=VUfL2nAX1X6LGv4C/a2Iyc7tixCDrX7ULRXtcGd+emrM3yYS/cVaZF7+h0JeZXYzNxR3b6kEBo/2h+vGsbL7kt0Z7OWS12aY1jftO8Z8jJj2IuI9M7Ak/5fgb1+JU1Opdc+KDQ5FzTp3WgCiczecU3+i7kqkAwIC8I7CTJgSA60= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823541; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HVLiXlgRnVDt9HN6YEs055+fC583nu5lD1opbfo202g=; b=RQD4/xHrO5s6SI6Zs6/KJXcCZAjrKbHzmq+IeqAtM9EgmecbR+QPFucYgiLY/6bJ+oAJltuDBqH56khPj8PtmfjVQNdumys2C3Y75y2euHHBoJwvsHjdD4jkaet/LzH4c4jYtXp4E+JFUlK007IM3VsQejHHHO0CYkrOl9X6QMQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1793823541702952.1503214360769; Wed, 4 Nov 2026 12:19:01 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1472525.1680433 (Exim 4.92) (envelope-from ) id 1xOhRK-00014I-JH; Wed, 04 Nov 2026 20:18:34 +0000 Received: by outflank-mailman (output) from mailman id 1472525.1680433; Wed, 04 Nov 2026 20:18:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRK-00013s-Dn; Wed, 04 Nov 2026 20:18:34 +0000 Received: by outflank-mailman (input) for mailman id 1472525; Wed, 04 Nov 2026 20:18:32 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRH-0000SB-Se for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 20:18:31 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1xOhRH-007PCO-95 for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 21:18:31 +0100 Received: from [10.42.69.9] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6aeb9312-e002-0a2a0a5209dd-0a2a450997ac-14 for ; Wed, 04 Nov 2026 21:18:31 +0100 Received: from [170.10.129.124] (helo=us-smtp-delivery-124.mimecast.com) by tlsNG-bad1c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6aeb9315-be1a-0a2a45090019-aa0a817c8afb-3 for ; Wed, 04 Nov 2026 21:18:30 +0100 Received: from mx-prod-mc-01.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-221-0n45YEU1NAq4Orr0v3_tpA-1; Wed, 04 Nov 2026 15:18:24 -0500 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8F11E1955EA0; Wed, 4 Nov 2026 20:18:21 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4544626C; Wed, 4 Nov 2026 20:18:21 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=mimecast20190719 header.d=redhat.com header.i="@redhat.com" header.h="From:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823509; 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=HVLiXlgRnVDt9HN6YEs055+fC583nu5lD1opbfo202g=; b=THAaKW7ywNyT8MDum3hE+yqnkD+wI/oebrZafWLtcSz3d4vTXDf4e7RKnu6MuAGw+eD60D 3APzsX5n5wPeigPTwX0OQ7cTgMaUgGCzNOWKIJ8xUTwCbOs5lQmOCa0yDhznHYyh1HdDPt A/WB5Fm/smC5tpBQpp3rnFJL8EgUcx4= X-MC-Unique: 0n45YEU1NAq4Orr0v3_tpA-1 X-Mimecast-MFC-AGG-ID: 0n45YEU1NAq4Orr0v3_tpA_1793823501 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 10/25] trace: add testing of 'nop' trace backend Date: Wed, 4 Nov 2026 15:17:46 -0500 Message-ID: <20261104201802.11556-11-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 X-Mimecast-MFC-PROC-ID: GL6LRPdCjsa2JGG19WnSwosxo20GsK7EaHA_uZqYKUM_1793823501 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-bad1c0/1793823511-3B0DD034-93B4A404/35/111497 X-purgate-type: clean X-purgate-size: 5329 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823543688158500 From: Daniel P. Berrang=C3=A9 This will be used to demonstrate that tracetool outputs the bare minimum of code when tracing is disabled. Currently, as of this initial commit of reference output, too much code is generated. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-11-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- tests/tracetool/nop.h | 29 ++++++++++++++++++ tests/tracetool/nop.c | 36 ++++++++++++++++++++++ tests/tracetool/meson.build | 1 + tests/tracetool/nop.rs | 51 +++++++++++++++++++++++++++++++ tests/tracetool/tracetool-test.py | 2 +- 5 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 tests/tracetool/nop.h create mode 100644 tests/tracetool/nop.c create mode 100644 tests/tracetool/nop.rs diff --git a/tests/tracetool/nop.h b/tests/tracetool/nop.h new file mode 100644 index 00000000000..443f5e0cf6e --- /dev/null +++ b/tests/tracetool/nop.h @@ -0,0 +1,29 @@ +/* This file is autogenerated by tracetool, do not edit. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef TRACE_TESTSUITE_GENERATED_TRACERS_H +#define TRACE_TESTSUITE_GENERATED_TRACERS_H + +#include "trace/control.h" + +extern TraceEvent _TRACE_TEST_BLAH_EVENT; +extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; +extern uint8_t _TRACE_TEST_BLAH_DSTATE; +extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; +#define TRACE_TEST_BLAH_ENABLED 1 +#define TRACE_TEST_WIBBLE_ENABLED 1 + +#define TRACE_TEST_BLAH_BACKEND_DSTATE() ( \ + false) + +static inline void trace_test_blah(void *context, const char *filename) +{ +} + +#define TRACE_TEST_WIBBLE_BACKEND_DSTATE() ( \ + false) + +static inline void trace_test_wibble(void *context, int value) +{ +} +#endif /* TRACE_TESTSUITE_GENERATED_TRACERS_H */ diff --git a/tests/tracetool/nop.c b/tests/tracetool/nop.c new file mode 100644 index 00000000000..f83d06252ea --- /dev/null +++ b/tests/tracetool/nop.c @@ -0,0 +1,36 @@ +/* This file is autogenerated by tracetool, do not edit. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" +#include "qemu/module.h" +#include "trace-testsuite.h" + +uint8_t _TRACE_TEST_BLAH_DSTATE; +uint8_t _TRACE_TEST_WIBBLE_DSTATE; +TraceEvent _TRACE_TEST_BLAH_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE + .id =3D 0, +#endif + .name =3D "test_blah", + .sstate =3D TRACE_TEST_BLAH_ENABLED, + .dstate =3D &_TRACE_TEST_BLAH_DSTATE +}; +TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE + .id =3D 0, +#endif + .name =3D "test_wibble", + .sstate =3D TRACE_TEST_WIBBLE_ENABLED, + .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE +}; +TraceEvent *testsuite_trace_events[] =3D { + &_TRACE_TEST_BLAH_EVENT, + &_TRACE_TEST_WIBBLE_EVENT, + NULL, +}; + +static void trace_testsuite_register_events(void) +{ + trace_event_register_group(testsuite_trace_events); +} +trace_init(trace_testsuite_register_events) diff --git a/tests/tracetool/meson.build b/tests/tracetool/meson.build index 09bbaaa86bf..f4f583e6224 100644 --- a/tests/tracetool/meson.build +++ b/tests/tracetool/meson.build @@ -5,6 +5,7 @@ test_env.set('PYTHONPATH', meson.project_source_root() / 's= cripts') test_env.set('PYTHONIOENCODING', 'utf-8') =20 backends =3D [ + 'nop', 'dtrace', 'ftrace', 'log', diff --git a/tests/tracetool/nop.rs b/tests/tracetool/nop.rs new file mode 100644 index 00000000000..5f007cecd04 --- /dev/null +++ b/tests/tracetool/nop.rs @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +// This file is @generated by tracetool, do not edit. + +#[allow(unused_imports)] +use std::ffi::c_char; +#[allow(unused_imports)] +use util::bindings; + +#[allow(dead_code)] +#[inline(always)] +fn trace_event_state_is_enabled(dstate: u8) -> bool { + (unsafe { trace_events_enabled_count }) !=3D 0 && dstate !=3D 0 +} + +extern "C" { + #[allow(dead_code)] + static mut trace_events_enabled_count: u32; +} +extern "C" { + #[allow(dead_code)] + static mut _TRACE_TEST_BLAH_DSTATE: u8; + #[allow(dead_code)] + static mut _TRACE_TEST_WIBBLE_DSTATE: u8; +} + +#[inline(always)] +#[allow(dead_code)] +pub fn trace_test_blah_enabled() -> bool +{ + false +} + +#[inline(always)] +#[allow(dead_code)] +pub fn trace_test_blah(_context: *mut (), _filename: &std::ffi::CStr) +{ +} + +#[inline(always)] +#[allow(dead_code)] +pub fn trace_test_wibble_enabled() -> bool +{ + false +} + +#[inline(always)] +#[allow(dead_code)] +pub fn trace_test_wibble(_context: *mut (), _value: std::ffi::c_int) +{ +} + diff --git a/tests/tracetool/tracetool-test.py b/tests/tracetool/tracetool-= test.py index 59e9ab3d6ef..74f315a4629 100755 --- a/tests/tracetool/tracetool-test.py +++ b/tests/tracetool/tracetool-test.py @@ -14,7 +14,7 @@ def get_formats(backend): "c", "h", ] - if backend in {"dtrace", "ftrace", "log", "simple", "syslog"}: + if backend in {"nop", "dtrace", "ftrace", "log", "simple", "syslog"}: formats +=3D ["rs"] if backend =3D=3D "dtrace": formats +=3D [ --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823710; cv=none; d=zohomail.com; s=zohoarc; b=AW2PeM5A7NKZqe3SyHjxHW8qvHdsQPqqM1tVQUuBVuFGFLSgdU2awc19ImOPPU9xUqB96U6DUXfeNJ5Ims/sasADqt0yVT/vuaOC279dxbPG+wdToCjWC8GeO/0xERroy3phywjD+wEwMUEqbi28/UINcmiqxeeeHjIsellJ+j0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823710; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sNaYu08RePiA3/TOJj7oi5LlAFNAX4bokf8QMENnVcY=; b=NTiaJyPyWYXhQITeyX9cVize7sKqX4y86BdlINnq4ihWyg05ukxCaKdvFyuBNc/TuoBNENo5ckY3EL3PaNXPV1ZrN1p0nMVJfeSrAGuqxHLFPca4kzPmzZxMGsfANtA2okBsZzm5pqHDFji/peok78SUZLj7Z5oi770HxF5Qas4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1793823710304852.223798841158; Wed, 4 Nov 2026 12:21:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRa-00074P-LO; Wed, 04 Nov 2026 15:18:51 -0500 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 1xOhRG-0006ww-D9 for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:30 -0500 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 1xOhRE-00065W-LV for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:30 -0500 Received: from mx-prod-mc-03.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-97-nGipy6pWP5CWYJDVjEyCHA-1; Wed, 04 Nov 2026 15:18:25 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9082C1955DBE; Wed, 4 Nov 2026 20:18:23 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 93ECE1829C21; Wed, 4 Nov 2026 20:18:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823508; 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=sNaYu08RePiA3/TOJj7oi5LlAFNAX4bokf8QMENnVcY=; b=Mgle1CxIO3L/k4aXuhS2eHv9zA38tu1XIDGrnM2z3txIV8zuBp8Y32537461i15eBR5jp6 VVTNQ6rq37YbGAYl7fM/wwKXCH/NzvhSSbAqo87ftG/Tn+tgBrss7+NcApvawXyip9g7uh 059+tKLX649z+ZC52PXA1Zjc8o191Bk= X-MC-Unique: nGipy6pWP5CWYJDVjEyCHA-1 X-Mimecast-MFC-AGG-ID: nGipy6pWP5CWYJDVjEyCHA_1793823503 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 11/25] trace: don't emit TraceEvent structs when 'nop' backend is used Date: Wed, 4 Nov 2026 15:17:47 -0500 Message-ID: <20261104201802.11556-12-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823710882158500 From: Daniel P. Berrang=C3=A9 The 'nop' backend is a short-hand for no trace probe usage at all. The emitted functions become a no-op, and as such there is no need to emit the TraceEvent structs, nor the DSTATE variables they reference. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-12-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- tests/tracetool/nop.h | 6 +-- tests/tracetool/nop.c | 29 --------------- scripts/tracetool/format/c.py | 69 ++++++++++++++++++----------------- scripts/tracetool/format/h.py | 14 ++++--- 4 files changed, 46 insertions(+), 72 deletions(-) diff --git a/tests/tracetool/nop.h b/tests/tracetool/nop.h index 443f5e0cf6e..64b6b005684 100644 --- a/tests/tracetool/nop.h +++ b/tests/tracetool/nop.h @@ -6,10 +6,8 @@ =20 #include "trace/control.h" =20 -extern TraceEvent _TRACE_TEST_BLAH_EVENT; -extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; -extern uint8_t _TRACE_TEST_BLAH_DSTATE; -extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; +#define _TRACE_TEST_BLAH_DSTATE 0 +#define _TRACE_TEST_WIBBLE_DSTATE 0 #define TRACE_TEST_BLAH_ENABLED 1 #define TRACE_TEST_WIBBLE_ENABLED 1 =20 diff --git a/tests/tracetool/nop.c b/tests/tracetool/nop.c index f83d06252ea..d34cc0ca742 100644 --- a/tests/tracetool/nop.c +++ b/tests/tracetool/nop.c @@ -5,32 +5,3 @@ #include "qemu/module.h" #include "trace-testsuite.h" =20 -uint8_t _TRACE_TEST_BLAH_DSTATE; -uint8_t _TRACE_TEST_WIBBLE_DSTATE; -TraceEvent _TRACE_TEST_BLAH_EVENT =3D { -#ifdef CONFIG_TRACE_SIMPLE - .id =3D 0, -#endif - .name =3D "test_blah", - .sstate =3D TRACE_TEST_BLAH_ENABLED, - .dstate =3D &_TRACE_TEST_BLAH_DSTATE -}; -TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { -#ifdef CONFIG_TRACE_SIMPLE - .id =3D 0, -#endif - .name =3D "test_wibble", - .sstate =3D TRACE_TEST_WIBBLE_ENABLED, - .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE -}; -TraceEvent *testsuite_trace_events[] =3D { - &_TRACE_TEST_BLAH_EVENT, - &_TRACE_TEST_WIBBLE_EVENT, - NULL, -}; - -static void trace_testsuite_register_events(void) -{ - trace_event_register_group(testsuite_trace_events); -} -trace_init(trace_testsuite_register_events) diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py index de1c154a881..5f6669c917c 100644 --- a/scripts/tracetool/format/c.py +++ b/scripts/tracetool/format/c.py @@ -29,41 +29,42 @@ def generate(events, backend, group): '#include "%s"' % header, '') =20 - for e in events: - out('uint8_t %s;' % e.api(e.QEMU_DSTATE)) + if len(list(backend.backend_modules())): + for e in events: + out('uint8_t %s;' % e.api(e.QEMU_DSTATE)) =20 - for e in events: - out('TraceEvent %(event)s =3D {', - '#ifdef CONFIG_TRACE_SIMPLE', - ' .id =3D 0,', - '#endif', - ' .name =3D \"%(name)s\",', - ' .sstate =3D %(sstate)s,', - ' .dstate =3D &%(dstate)s', + for e in events: + out('TraceEvent %(event)s =3D {', + '#ifdef CONFIG_TRACE_SIMPLE', + ' .id =3D 0,', + '#endif', + ' .name =3D \"%(name)s\",', + ' .sstate =3D %(sstate)s,', + ' .dstate =3D &%(dstate)s', + '};', + event =3D e.api(e.QEMU_EVENT), + name =3D e.name, + sstate =3D "TRACE_%s_ENABLED" % e.name.upper(), + dstate =3D e.api(e.QEMU_DSTATE)) + + out('TraceEvent *%(group)s_trace_events[] =3D {', + group =3D group.lower()) + + for e in events: + out(' &%(event)s,', event =3D e.api(e.QEMU_EVENT)) + + out(' NULL,', '};', - event =3D e.api(e.QEMU_EVENT), - name =3D e.name, - sstate =3D "TRACE_%s_ENABLED" % e.name.upper(), - dstate =3D e.api(e.QEMU_DSTATE)) + '') =20 - out('TraceEvent *%(group)s_trace_events[] =3D {', - group =3D group.lower()) + out('static void trace_%(group)s_register_events(void)', + '{', + ' trace_event_register_group(%(group)s_trace_events);', + '}', + 'trace_init(trace_%(group)s_register_events)', + group =3D group.lower()) =20 - for e in events: - out(' &%(event)s,', event =3D e.api(e.QEMU_EVENT)) - - out(' NULL,', - '};', - '') - - out('static void trace_%(group)s_register_events(void)', - '{', - ' trace_event_register_group(%(group)s_trace_events);', - '}', - 'trace_init(trace_%(group)s_register_events)', - group =3D group.lower()) - - backend.generate_begin(active_events, group) - for event in active_events: - backend.generate(event, group) - backend.generate_end(active_events, group) + backend.generate_begin(active_events, group) + for event in active_events: + backend.generate(event, group) + backend.generate_end(active_events, group) diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index 4dc1ad7eb15..6ffb7256e31 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -27,12 +27,16 @@ def generate(events, backend, group): '#include "%s"' % header, '') =20 - for e in events: - out('extern TraceEvent %(event)s;', - event =3D e.api(e.QEMU_EVENT)) + if len(list(backend.backend_modules())): + for e in events: + out('extern TraceEvent %(event)s;', + event =3D e.api(e.QEMU_EVENT)) =20 - for e in events: - out('extern uint8_t %s;' % e.api(e.QEMU_DSTATE)) + for e in events: + out('extern uint8_t %s;' % e.api(e.QEMU_DSTATE)) + else: + for e in events: + out('#define %s 0' % e.api(e.QEMU_DSTATE)) =20 # static state for e in events: --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823596; cv=none; d=zohomail.com; s=zohoarc; b=nmzDQnF8xHwM8UecHJy3CG9ZCyQqikS8I4WCW5lK24/wKsR+n3AmOd1uqpawW+anuy/Xee2tbTE8jy+5QFXy5jUkijxrBHm60bfbSg/RORpAiEn4tvO7uhqQeb/K60XZdW3DunTBF/nkMdm3ZIzS396oEKkp+qHl29ljzORscok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823596; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2Ozn+n7oejeYEU5bC9zbT0ZwSD6t+CLu8qMU+CoA5yo=; b=IpIt4snFKlSkUQHWMiOXxuDAD1LdtzGMoSClXy/o1WQjBhQBtqU7REUsKO6/EHJBHjD0vFcUC9Am7kK7VW45bQyFe9EMljTBQ2JFEa8HZNUGJW89G8uCt/K/RY6fWYc3oVKchNIaLAa0HHzQeqh6mHFl857Bi/NP+FIRwFp5VVc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1793823596937887.074560819435; Wed, 4 Nov 2026 12:19:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRd-00077P-Ec; Wed, 04 Nov 2026 15:18:53 -0500 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 1xOhRJ-0006yN-9V for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xOhRG-000669-Hu for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:33 -0500 Received: from mx-prod-mc-03.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-642-e78b6v3xPsO7Zd8btrPKnA-1; Wed, 04 Nov 2026 15:18:27 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6F68A1955DBB; Wed, 4 Nov 2026 20:18:25 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 87A7A195604F; Wed, 4 Nov 2026 20:18:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823509; 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=2Ozn+n7oejeYEU5bC9zbT0ZwSD6t+CLu8qMU+CoA5yo=; b=YFd9MJgttBjnJ4U30GfRCmyTqeg5VkivuFR6xueP/0B+orsiJs4JQp17WS8e2Ypzarbz0D Gm+gC2OjHoR3hmWWTB7y3By8FBSwHGLNQBvRddpcY+6SUpK9nIvvy1kLW//Tj2AO3eXDjk 41iCFs7eS33c4HRNmGb4QarbnrTtchU= X-MC-Unique: e78b6v3xPsO7Zd8btrPKnA-1 X-Mimecast-MFC-AGG-ID: e78b6v3xPsO7Zd8btrPKnA_1793823505 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 12/25] trace: add test of generation with all backends enabled Date: Wed, 4 Nov 2026 15:17:48 -0500 Message-ID: <20261104201802.11556-13-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823598765158500 From: Daniel P. Berrang=C3=A9 This reveals potentially interesting patterns in the generated code when multiple backends are present. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-13-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- tests/tracetool/all.h | 102 +++++++++++++++++++++++++++ tests/tracetool/all.c | 65 +++++++++++++++++ tests/tracetool/all.d | 10 +++ tests/tracetool/all.log-stap | 15 ++++ tests/tracetool/all.rs | 90 +++++++++++++++++++++++ tests/tracetool/all.simpletrace-stap | 16 +++++ tests/tracetool/all.stap | 14 ++++ tests/tracetool/all.ust-events-c | 14 ++++ tests/tracetool/all.ust-events-h | 56 +++++++++++++++ tests/tracetool/meson.build | 3 +- tests/tracetool/tracetool-test.py | 12 ++-- 11 files changed, 392 insertions(+), 5 deletions(-) create mode 100644 tests/tracetool/all.h create mode 100644 tests/tracetool/all.c create mode 100644 tests/tracetool/all.d create mode 100644 tests/tracetool/all.log-stap create mode 100644 tests/tracetool/all.rs create mode 100644 tests/tracetool/all.simpletrace-stap create mode 100644 tests/tracetool/all.stap create mode 100644 tests/tracetool/all.ust-events-c create mode 100644 tests/tracetool/all.ust-events-h diff --git a/tests/tracetool/all.h b/tests/tracetool/all.h new file mode 100644 index 00000000000..41fa4d0e8a2 --- /dev/null +++ b/tests/tracetool/all.h @@ -0,0 +1,102 @@ +/* This file is autogenerated by tracetool, do not edit. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef TRACE_TESTSUITE_GENERATED_TRACERS_H +#define TRACE_TESTSUITE_GENERATED_TRACERS_H + +#include "trace/control.h" + +extern TraceEvent _TRACE_TEST_BLAH_EVENT; +extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; +extern uint8_t _TRACE_TEST_BLAH_DSTATE; +extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; +#define TRACE_TEST_BLAH_ENABLED 1 +#define TRACE_TEST_WIBBLE_ENABLED 1 +#ifndef SDT_USE_VARIADIC +#define SDT_USE_VARIADIC 1 +#endif +#include "trace-dtrace-testsuite.h" + +#undef SDT_USE_VARIADIC +#ifndef QEMU_TEST_BLAH_ENABLED +#define QEMU_TEST_BLAH_ENABLED() true +#endif +#ifndef QEMU_TEST_WIBBLE_ENABLED +#define QEMU_TEST_WIBBLE_ENABLED() true +#endif +#include "trace/ftrace.h" + +#include "qemu/log-for-trace.h" + +void _simple_trace_test_blah(void *context, const char *filename); +void _simple_trace_test_wibble(void *context, int value); + +#include + +#include +#include "trace-ust-testsuite.h" + +/* tracepoint_enabled() was introduced in LTTng UST 2.7 */ +#ifndef tracepoint_enabled +#define tracepoint_enabled(a, b) true +#endif + + +#define TRACE_TEST_BLAH_BACKEND_DSTATE() ( \ + QEMU_TEST_BLAH_ENABLED() || \ + trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) || \ + trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) || \ + trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) || \ + trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) || \ + tracepoint_enabled(qemu, test_blah) || \ + false) + +static inline void trace_test_blah(void *context, const char *filename) +{ + QEMU_TEST_BLAH(context, filename); + tracepoint(qemu, test_blah, context, filename); + if (trace_event_get_state(TRACE_TEST_BLAH)) { +#line 4 "trace-events" + ftrace_write("test_blah " "Blah context=3D%p filename=3D%s" "\n" ,= context, filename); +#line 62 "all.h" + if (qemu_loglevel_mask(LOG_TRACE)) { +#line 4 "trace-events" + qemu_log("test_blah " "Blah context=3D%p filename=3D%s" "\n", = context, filename); +#line 66 "all.h" + } + _simple_trace_test_blah(context, filename); +#line 4 "trace-events" + syslog(LOG_INFO, "test_blah " "Blah context=3D%p filename=3D%s" , = context, filename); +#line 71 "all.h" + } +} + +#define TRACE_TEST_WIBBLE_BACKEND_DSTATE() ( \ + QEMU_TEST_WIBBLE_ENABLED() || \ + trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ + trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ + trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ + trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ + tracepoint_enabled(qemu, test_wibble) || \ + false) + +static inline void trace_test_wibble(void *context, int value) +{ + QEMU_TEST_WIBBLE(context, value); + tracepoint(qemu, test_wibble, context, value); + if (trace_event_get_state(TRACE_TEST_WIBBLE)) { +#line 5 "trace-events" + ftrace_write("test_wibble " "Wibble context=3D%p value=3D%d" "\n" = , context, value); +#line 91 "all.h" + if (qemu_loglevel_mask(LOG_TRACE)) { +#line 5 "trace-events" + qemu_log("test_wibble " "Wibble context=3D%p value=3D%d" "\n",= context, value); +#line 95 "all.h" + } + _simple_trace_test_wibble(context, value); +#line 5 "trace-events" + syslog(LOG_INFO, "test_wibble " "Wibble context=3D%p value=3D%d" ,= context, value); +#line 100 "all.h" + } +} +#endif /* TRACE_TESTSUITE_GENERATED_TRACERS_H */ diff --git a/tests/tracetool/all.c b/tests/tracetool/all.c new file mode 100644 index 00000000000..820ddb575b0 --- /dev/null +++ b/tests/tracetool/all.c @@ -0,0 +1,65 @@ +/* This file is autogenerated by tracetool, do not edit. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" +#include "qemu/module.h" +#include "trace-testsuite.h" + +uint8_t _TRACE_TEST_BLAH_DSTATE; +uint8_t _TRACE_TEST_WIBBLE_DSTATE; +TraceEvent _TRACE_TEST_BLAH_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE + .id =3D 0, +#endif + .name =3D "test_blah", + .sstate =3D TRACE_TEST_BLAH_ENABLED, + .dstate =3D &_TRACE_TEST_BLAH_DSTATE +}; +TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { +#ifdef CONFIG_TRACE_SIMPLE + .id =3D 0, +#endif + .name =3D "test_wibble", + .sstate =3D TRACE_TEST_WIBBLE_ENABLED, + .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE +}; +TraceEvent *testsuite_trace_events[] =3D { + &_TRACE_TEST_BLAH_EVENT, + &_TRACE_TEST_WIBBLE_EVENT, + NULL, +}; + +static void trace_testsuite_register_events(void) +{ + trace_event_register_group(testsuite_trace_events); +} +trace_init(trace_testsuite_register_events) +#include "qemu/osdep.h" +#include "trace/control.h" +#include "trace/simple.h" + +void _simple_trace_test_blah(void *context, const char *filename) +{ + TraceBufferRecord rec; + size_t argfilename_len =3D filename ? MIN(strlen(filename), MAX_TRACE_= STRLEN) : 0; + + if (trace_record_start(&rec, _TRACE_TEST_BLAH_EVENT.id, 8 + 4 + argfil= ename_len)) { + return; /* Trace Buffer Full, Event Dropped ! */ + } + trace_record_write_u64(&rec, (uintptr_t)(uint64_t *)context); + trace_record_write_str(&rec, filename, argfilename_len); + trace_record_finish(&rec); +} + +void _simple_trace_test_wibble(void *context, int value) +{ + TraceBufferRecord rec; + + if (trace_record_start(&rec, _TRACE_TEST_WIBBLE_EVENT.id, 8 + 8)) { + return; /* Trace Buffer Full, Event Dropped ! */ + } + trace_record_write_u64(&rec, (uintptr_t)(uint64_t *)context); + trace_record_write_u64(&rec, (uint64_t)value); + trace_record_finish(&rec); +} + diff --git a/tests/tracetool/all.d b/tests/tracetool/all.d new file mode 100644 index 00000000000..5cc06f9f4f5 --- /dev/null +++ b/tests/tracetool/all.d @@ -0,0 +1,10 @@ +/* This file is autogenerated by tracetool, do not edit. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +provider qemu { + +probe test_blah(void * context,const char * filename); + +probe test_wibble(void * context,int value); + +}; diff --git a/tests/tracetool/all.log-stap b/tests/tracetool/all.log-stap new file mode 100644 index 00000000000..092986e0b61 --- /dev/null +++ b/tests/tracetool/all.log-stap @@ -0,0 +1,15 @@ +/* This file is autogenerated by tracetool, do not edit. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +probe qemu.log.test_blah =3D qemu.test_blah ? +{ + try { + argfilename_str =3D filename ? user_string_n(filename, 512) : "" + } catch {} + printf("%d@%d test_blah Blah context=3D%p filename=3D%s\n", pid(), get= timeofday_ns(), context, argfilename_str) +} +probe qemu.log.test_wibble =3D qemu.test_wibble ? +{ + printf("%d@%d test_wibble Wibble context=3D%p value=3D%d\n", pid(), ge= ttimeofday_ns(), context, value) +} + diff --git a/tests/tracetool/all.rs b/tests/tracetool/all.rs new file mode 100644 index 00000000000..c8c9d288366 --- /dev/null +++ b/tests/tracetool/all.rs @@ -0,0 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +// This file is @generated by tracetool, do not edit. + +#[allow(unused_imports)] +use std::ffi::c_char; +#[allow(unused_imports)] +use util::bindings; + +#[allow(dead_code)] +#[inline(always)] +fn trace_event_state_is_enabled(dstate: u8) -> bool { + (unsafe { trace_events_enabled_count }) !=3D 0 && dstate !=3D 0 +} + +extern "C" { + #[allow(dead_code)] + static mut trace_events_enabled_count: u32; +} +extern "C" { + #[allow(dead_code)] + static mut _TRACE_TEST_BLAH_DSTATE: u8; + #[allow(dead_code)] + static mut _TRACE_TEST_WIBBLE_DSTATE: u8; +} + +use std::cell::UnsafeCell; + +extern "C" { + #[allow(dead_code)] + static qemu_test_blah_semaphore: UnsafeCell; + #[allow(dead_code)] + static qemu_test_wibble_semaphore: UnsafeCell; +} + +#[inline(always)] +#[allow(dead_code)] +pub fn trace_test_blah_enabled() -> bool +{ + (unsafe {qemu_test_blah_semaphore.get().read_volatile()}) !=3D 0 || + trace_event_state_is_enabled(unsafe { _TRACE_TEST_BLAH_DSTATE}) || + false +} + +#[inline(always)] +#[allow(dead_code)] +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 =3D c"Blah context=3D%p filename=3D%s"; + unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_= char, _context /* as *mut () */, _filename.as_ptr());} + let format_string =3D c"test_blah Blah context=3D%p filename=3D%s\= n"; + if (unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) !=3D= 0 { + unsafe { bindings::qemu_log(format_string.as_ptr() as *const c= _char, _context /* as *mut () */, _filename.as_ptr());} + } + extern "C" { fn _simple_trace_test_blah(_context: *mut (), _filena= me: *const std::ffi::c_char); } + unsafe { _simple_trace_test_blah(_context, _filename.as_ptr()); } + 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 /* as *mut () */, _filename.as_ptr());} + } +} + +#[inline(always)] +#[allow(dead_code)] +pub fn trace_test_wibble_enabled() -> bool +{ + (unsafe {qemu_test_wibble_semaphore.get().read_volatile()}) !=3D 0 || + trace_event_state_is_enabled(unsafe { _TRACE_TEST_WIBBLE_DSTATE}) || + false +} + +#[inline(always)] +#[allow(dead_code)] +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 =3D c"Wibble context=3D%p value=3D%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 =3D c"test_wibble Wibble context=3D%p value=3D%d= \n"; + if (unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) !=3D= 0 { + unsafe { bindings::qemu_log(format_string.as_ptr() as *const c= _char, _context /* as *mut () */, _value /* as std::ffi::c_int */);} + } + extern "C" { fn _simple_trace_test_wibble(_context: *mut (), _valu= e: std::ffi::c_int); } + unsafe { _simple_trace_test_wibble(_context, _value); } + 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 /* as *mut () */, _value /* as std::ffi::c_int *= /);} + } +} + diff --git a/tests/tracetool/all.simpletrace-stap b/tests/tracetool/all.sim= pletrace-stap new file mode 100644 index 00000000000..d064e3e286a --- /dev/null +++ b/tests/tracetool/all.simpletrace-stap @@ -0,0 +1,16 @@ +/* This file is autogenerated by tracetool, do not edit. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +probe qemu.simpletrace.test_blah =3D qemu.test_blah ? +{ + try { + argfilename_str =3D filename ? user_string_n(filename, 512) : "" + } catch {} + argfilename_len =3D strlen(argfilename_str) + printf("%8b%8b%8b%4b%4b%8b%4b%.*s", 1, 0, gettimeofday_ns(), 24 + 8 + = 4 + argfilename_len, pid(), context, argfilename_len, argfilename_len, argf= ilename_str) +} +probe qemu.simpletrace.test_wibble =3D qemu.test_wibble ? +{ + printf("%8b%8b%8b%4b%4b%8b%8b", 1, 1, gettimeofday_ns(), 24 + 8 + 8, p= id(), context, value) +} + diff --git a/tests/tracetool/all.stap b/tests/tracetool/all.stap new file mode 100644 index 00000000000..9c5d8a527ce --- /dev/null +++ b/tests/tracetool/all.stap @@ -0,0 +1,14 @@ +/* This file is autogenerated by tracetool, do not edit. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +probe qemu.test_blah =3D process("qemu").mark("test_blah") +{ + context =3D $arg1; + filename =3D $arg2; +} +probe qemu.test_wibble =3D process("qemu").mark("test_wibble") +{ + context =3D $arg1; + value =3D $arg2; +} + diff --git a/tests/tracetool/all.ust-events-c b/tests/tracetool/all.ust-eve= nts-c new file mode 100644 index 00000000000..db232240568 --- /dev/null +++ b/tests/tracetool/all.ust-events-c @@ -0,0 +1,14 @@ +/* This file is autogenerated by tracetool, do not edit. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" + +#define TRACEPOINT_DEFINE +#define TRACEPOINT_CREATE_PROBES + +/* If gcc version 4.7 or older is used, LTTng ust gives a warning when com= piling with + -Wredundant-decls. + */ +#pragma GCC diagnostic ignored "-Wredundant-decls" + +#include "trace-ust-all.h" diff --git a/tests/tracetool/all.ust-events-h b/tests/tracetool/all.ust-eve= nts-h new file mode 100644 index 00000000000..4621a995fc1 --- /dev/null +++ b/tests/tracetool/all.ust-events-h @@ -0,0 +1,56 @@ +/* This file is autogenerated by tracetool, do not edit. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#undef TRACEPOINT_PROVIDER +#define TRACEPOINT_PROVIDER qemu + +#undef TRACEPOINT_INCLUDE +#define TRACEPOINT_INCLUDE "./trace-ust.h" + +#if !defined (TRACE_TESTSUITE_GENERATED_UST_H) || \ + defined(TRACEPOINT_HEADER_MULTI_READ) +#define TRACE_TESTSUITE_GENERATED_UST_H + +#include + +/* + * LTTng ust 2.0 does not allow you to use TP_ARGS(void) for tracepoints + * requiring no arguments. We define these macros introduced in more recen= t * versions of LTTng ust as a workaround + */ +#ifndef _TP_EXPROTO1 +#define _TP_EXPROTO1(a) void +#endif +#ifndef _TP_EXDATA_PROTO1 +#define _TP_EXDATA_PROTO1(a) void *__tp_data +#endif +#ifndef _TP_EXDATA_VAR1 +#define _TP_EXDATA_VAR1(a) __tp_data +#endif +#ifndef _TP_EXVAR1 +#define _TP_EXVAR1(a) +#endif + +TRACEPOINT_EVENT( + qemu, + test_blah, + TP_ARGS(void *, context, const char *, filename), + TP_FIELDS( + ctf_integer_hex(void *, context, context) + ctf_string(filename, filename) + ) +) + +TRACEPOINT_EVENT( + qemu, + test_wibble, + TP_ARGS(void *, context, int, value), + TP_FIELDS( + ctf_integer_hex(void *, context, context) + ctf_integer(int, value, value) + ) +) + +#endif /* TRACE_TESTSUITE_GENERATED_UST_H */ + +/* This part must be outside ifdef protection */ +#include diff --git a/tests/tracetool/meson.build b/tests/tracetool/meson.build index f4f583e6224..b024dc6e405 100644 --- a/tests/tracetool/meson.build +++ b/tests/tracetool/meson.build @@ -11,7 +11,8 @@ backends =3D [ 'log', 'simple', 'syslog', - 'ust' + 'ust', + 'all' ] =20 # The tracetool-test.py program has portability problems on Windows. diff --git a/tests/tracetool/tracetool-test.py b/tests/tracetool/tracetool-= test.py index 74f315a4629..2f6328e68c3 100755 --- a/tests/tracetool/tracetool-test.py +++ b/tests/tracetool/tracetool-test.py @@ -14,16 +14,16 @@ def get_formats(backend): "c", "h", ] - if backend in {"nop", "dtrace", "ftrace", "log", "simple", "syslog"}: + if backend in {"nop", "dtrace", "ftrace", "log", "simple", "syslog", "= all"}: formats +=3D ["rs"] - if backend =3D=3D "dtrace": + if backend in {"dtrace", "all"}: formats +=3D [ "d", "log-stap", "simpletrace-stap", "stap", ] - if backend =3D=3D "ust": + if backend in {"ust", "all"}: formats +=3D [ "ust-events-c", "ust-events-h", @@ -36,8 +36,12 @@ def test_tracetool_one(tracetool, backend, fmt, src_dir,= build_dir): actual_file =3D Path(build_dir, rel_filename) expect_file =3D Path(src_dir, rel_filename) =20 + backends =3D backend + if backends =3D=3D "all": + backends =3D "dtrace,ftrace,log,simple,syslog,ust" + args =3D [sys.executable, tracetool, - f"--format=3D{fmt}", f"--backends=3D{backend}", "--group=3Dtes= tsuite"] + f"--format=3D{fmt}", f"--backends=3D{backends}", "--group=3Dte= stsuite"] =20 if fmt.find("stap") !=3D -1: args +=3D ["--binary=3Dqemu", "--probe-prefix=3Dqemu"] --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1793823544; cv=none; d=zohomail.com; s=zohoarc; b=ZfTjh7x+sCTqF9a1oeT1MbGwTaYHt3OkFH8CTBtOlwosjT6J+RWCmppra8qLpBMRaXlBvP6OrMvF9gh/Tgy71yMzOZxStjkjWcOWFebe7QfhERUCMSzs3W7BxvK7s7B30qrnuz3uj4lt9MsI2vWXtb8vMf0ukBgx8ExAZ0QFtqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823544; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gkkz7NQLFS94E1ZeoUXFtFHJe+s6Qg+c1y84IQKKE4k=; b=cHMdiVIZPxVDGUOYznrPkj12GW6Jw5Vdy8yLoYstuxMd/IosXZmNv6PLMG0SWTtIZQkBaisYDeFrreyE7ESTfDHP3xYoeSc1Zu/UA4BJgHT9ONqP7H3c7etev6nbdRt19ex5qkP0tUjEImjVT8W5I8JU18Pjh6tPVC+7bP8KvxI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1793823544942609.1352413740982; Wed, 4 Nov 2026 12:19:04 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1472534.1680450 (Exim 4.92) (envelope-from ) id 1xOhRO-0001fn-Ca; Wed, 04 Nov 2026 20:18:38 +0000 Received: by outflank-mailman (output) from mailman id 1472534.1680450; Wed, 04 Nov 2026 20:18:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRO-0001eU-1X; Wed, 04 Nov 2026 20:18:38 +0000 Received: by outflank-mailman (input) for mailman id 1472534; Wed, 04 Nov 2026 20:18:36 +0000 Received: from mx.expurgate.net ([194.145.224.20]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRL-0001Bx-Ka for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 20:18:35 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1xOhRL-00BuCu-1Q for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 21:18:35 +0100 Received: from [10.42.69.10] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6aeb9305-2eae-0a2a0a5409dd-0a2a450acd02-22 for ; Wed, 04 Nov 2026 21:18:35 +0100 Received: from [170.10.129.124] (helo=us-smtp-delivery-124.mimecast.com) by tlsNG-4011c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6aeb9319-f2d2-0a2a450a0019-aa0a817c96e5-3 for ; Wed, 04 Nov 2026 21:18:34 +0100 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-463-OrIPcHMtNfWaL90iiMEVww-1; Wed, 04 Nov 2026 15:18:29 -0500 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 521391800596; Wed, 4 Nov 2026 20:18:27 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 591BD39206; Wed, 4 Nov 2026 20:18:26 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=mimecast20190719 header.d=redhat.com header.i="@redhat.com" header.h="From:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823513; 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=gkkz7NQLFS94E1ZeoUXFtFHJe+s6Qg+c1y84IQKKE4k=; b=Sys5afgdNy4IFpBCjmgfoplsc2g5uw0vwptSnc9RT19Spaqr28MF9Q3LftnXN0nWkbIG6S M01yW8g/3i4O41UUmjXDK3/q3lfhtdgp+a0R0geXzsdzaEQQcIQSLON5GpvgeEQBnVwSKC Ozz8/g5finnhpv8kAxe1imRN64CCISs= X-MC-Unique: OrIPcHMtNfWaL90iiMEVww-1 X-Mimecast-MFC-AGG-ID: OrIPcHMtNfWaL90iiMEVww_1793823507 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 13/25] trace: remove redundant headers from simple trace backend code Date: Wed, 4 Nov 2026 15:17:49 -0500 Message-ID: <20261104201802.11556-14-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 X-Mimecast-MFC-PROC-ID: Kbh4u2abBcGiFYqOYNCevSkVwuTW_7kTCP5QVNzVfO4_1793823507 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-4011c0/1793823515-4B6D6CFC-EC9662FD/35/111497 X-purgate-type: clean X-purgate-size: 2149 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823545709158500 From: Daniel P. Berrang=C3=A9 The main formatter for .h/.c files for generated trace code already includes osdep.h and control.h, so it is redundant for the simple trace backend to add them too. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-14-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- tests/tracetool/all.c | 2 -- tests/tracetool/simple.c | 2 -- scripts/tracetool/backend/simple.py | 4 +--- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/tracetool/all.c b/tests/tracetool/all.c index 820ddb575b0..3b8d4d32d17 100644 --- a/tests/tracetool/all.c +++ b/tests/tracetool/all.c @@ -34,8 +34,6 @@ static void trace_testsuite_register_events(void) trace_event_register_group(testsuite_trace_events); } trace_init(trace_testsuite_register_events) -#include "qemu/osdep.h" -#include "trace/control.h" #include "trace/simple.h" =20 void _simple_trace_test_blah(void *context, const char *filename) diff --git a/tests/tracetool/simple.c b/tests/tracetool/simple.c index 820ddb575b0..3b8d4d32d17 100644 --- a/tests/tracetool/simple.c +++ b/tests/tracetool/simple.c @@ -34,8 +34,6 @@ static void trace_testsuite_register_events(void) trace_event_register_group(testsuite_trace_events); } trace_init(trace_testsuite_register_events) -#include "qemu/osdep.h" -#include "trace/control.h" #include "trace/simple.h" =20 void _simple_trace_test_blah(void *context, const char *filename) diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backen= d/simple.py index b131e4fc194..e22683c7d2a 100644 --- a/scripts/tracetool/backend/simple.py +++ b/scripts/tracetool/backend/simple.py @@ -48,9 +48,7 @@ def generate_h_backend_dstate(event, group): =20 =20 def generate_c_begin(events, group): - out('#include "qemu/osdep.h"', - '#include "trace/control.h"', - '#include "trace/simple.h"', + out('#include "trace/simple.h"', '') =20 =20 --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1793823534; cv=none; d=zohomail.com; s=zohoarc; b=kcjSX8Ss40dEo2h8qgMBJAv8yuyFjL5pPNvWrwYjF0scroYdDe+hlcQt0Vxzyy1cfEhMvuwqyQnjtx49AC2UHXX1Q6w7w6QoPR3mr7xMU/1NUFFT/F8VhhTXc1akFMH4M4B56DBFXogjht44Qgeye+idRRkhVDHVGgKdPKdNIec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823534; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DlKbUaAjj04ta+A1/nUMfLg/CAVRg3igZyolJR7CeYY=; b=VcaFHH49PApEpU644YE4Po1ijZ6mjKANePf7V6LgggxuoNadCdBFBUWsKiSisPsdkY0xqkaxnhkRfrdMSANNdOfuy1TgHiV1kAI4dymzWHjX72rpePUGD9ar0PfkURH9xHCi6wLSHf/2EINzR2w0QpD06PlBceUi+4wrdUFPKqo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1793823534975113.22730964452978; Wed, 4 Nov 2026 12:18:54 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1472535.1680456 (Exim 4.92) (envelope-from ) id 1xOhRP-0001mA-6A; Wed, 04 Nov 2026 20:18:39 +0000 Received: by outflank-mailman (output) from mailman id 1472535.1680456; Wed, 04 Nov 2026 20:18:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRO-0001jw-N5; Wed, 04 Nov 2026 20:18:38 +0000 Received: by outflank-mailman (input) for mailman id 1472535; Wed, 04 Nov 2026 20:18:36 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRL-0001CD-Ly for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 20:18:35 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1xOhRL-00FVOo-2m for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 21:18:35 +0100 Received: from [10.42.69.1] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6aeb930e-bab6-0a2a0a5309dd-0a2a4501af60-28 for ; Wed, 04 Nov 2026 21:18:35 +0100 Received: from [170.10.129.124] (helo=us-smtp-delivery-124.mimecast.com) by tlsNG-d62444.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6aeb9319-5984-0a2a45010019-aa0a817ccb6f-3 for ; Wed, 04 Nov 2026 21:18:34 +0100 Received: from mx-prod-mc-03.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-577-XdjpUXIEPBmDb0Z7Y61BCA-1; Wed, 04 Nov 2026 15:18:30 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AC0C51955DD7; Wed, 4 Nov 2026 20:18:28 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2CAFC195604C; Wed, 4 Nov 2026 20:18:28 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=mimecast20190719 header.d=redhat.com header.i="@redhat.com" header.h="From:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823513; 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=DlKbUaAjj04ta+A1/nUMfLg/CAVRg3igZyolJR7CeYY=; b=D7KqFFtlGRQp6sADKaeDGPqR3G+cnGa5fV8UXuqz4U+0mbcKsbXlX/AWnd0HVKxbTa0ypa DajvBOXfXSQ0vYLq+jQIIX+5yzLVwrxulyt1NXEVQQbB0GvwYRSuvnJpY/iUEOOlAbtZxR LOfqf7DOJn9p5IrCm7UnAw50Su4fXY0= X-MC-Unique: XdjpUXIEPBmDb0Z7Y61BCA-1 X-Mimecast-MFC-AGG-ID: XdjpUXIEPBmDb0Z7Y61BCA_1793823508 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 14/25] trace: include probe name in Rust format strings Date: Wed, 4 Nov 2026 15:17:50 -0500 Message-ID: <20261104201802.11556-15-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-MFC-PROC-ID: j3Gj4VdTxfpgW9jjr9TscMLVfZqbiN0uE3B8uq49JoE_1793823508 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-d62444/1793823515-BC95A757-A913449A/35/111497 X-purgate-type: clean X-purgate-size: 6988 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823535548158500 From: Daniel P. Berrang=C3=A9 The C format strings all include the probe name as a prefix, however, this was missed in the Rust generators for ftrace and syslog. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-15-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- 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/backen= d/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 =3D c"%(fmt)s";', ' unsafe {bindings::ftrace_write(format_string.as_ptr() as = *const c_char, %(args)s);}', - fmt=3Dexpand_format_string(event.fmt), + fmt=3Dexpand_format_string(event.fmt, event.name + " "), args=3Devent.args.rust_call_varargs()) diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backen= d/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 =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), + fmt=3Dexpand_format_string(event.fmt, event.name + " "), args=3Devent.args.rust_call_varargs()) =20 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 =3D c"Blah context=3D%p filename=3D%s"; + let format_string =3D c"test_blah Blah context=3D%p filename=3D%s"; unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_= char, _context /* as *mut () */, _filename.as_ptr());} let format_string =3D c"test_blah Blah context=3D%p filename=3D%s\= n"; if (unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) !=3D= 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 (), _filena= me: *const std::ffi::c_char); } unsafe { _simple_trace_test_blah(_context, _filename.as_ptr()); } - let format_string =3D c"Blah context=3D%p filename=3D%s"; + let format_string =3D c"test_blah Blah context=3D%p filename=3D%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 =3D c"Wibble context=3D%p value=3D%d"; + let format_string =3D c"test_wibble Wibble context=3D%p value=3D%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 =3D c"test_wibble Wibble context=3D%p value=3D%d= \n"; if (unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) !=3D= 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 (), _valu= e: std::ffi::c_int); } unsafe { _simple_trace_test_wibble(_context, _value); } - let format_string =3D c"Wibble context=3D%p value=3D%d"; + let format_string =3D c"test_wibble Wibble context=3D%p value=3D%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 =3D c"Blah context=3D%p filename=3D%s"; + let format_string =3D c"test_blah Blah context=3D%p filename=3D%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 =3D c"Wibble context=3D%p value=3D%d"; + let format_string =3D c"test_wibble Wibble context=3D%p value=3D%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 =3D c"Blah context=3D%p filename=3D%s"; + let format_string =3D c"test_blah Blah context=3D%p filename=3D%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 =3D c"Wibble context=3D%p value=3D%d"; + let format_string =3D c"test_wibble Wibble context=3D%p value=3D%d= "; unsafe {::trace::syslog(::trace::LOG_INFO, format_string.as_ptr() = as *const c_char, _context /* as *mut () */, _value /* as std::ffi::c_int *= /);} } } --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823582; cv=none; d=zohomail.com; s=zohoarc; b=USmqZAoLPuxQ+T/pKkVj4FGHtV/zxmZww5TwvpTbqqpyfudV6zrxOqOYrSi7XeDelOCs8WAurrrHYPvmGZ2pLEdPlXnyXKfwExJRQRCs032nw+XF6N0Xg78n7FXrnAgN/uWmSRuyvmeYeB5zIre87cpOqeLMx5Eh35ycEl6HMiw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823582; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LGa+HMdMyZp+fDqANZnP8jW3DD1gu9BvhH368Mvy95o=; b=bYbnNBN4oDmG4nv5Z6M64AzmQcGS2vtGn3XoUhZ5JSfxsZt3PfdSwMjWwa3jXUaHlMAxVdzmAYQvS8ZSgCZXJe+/f5gyYC6EBXDP3VZuts6ZiZMP4yJRfqE1vstFlrCSjLa0xcx824uaul2V1WeqJECQV8Mvrdvmz20F1lJaXrg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 179382358238981.20078363235041; Wed, 4 Nov 2026 12:19:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRf-0007Bc-Ka; Wed, 04 Nov 2026 15:18:55 -0500 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 1xOhRQ-00070R-FL for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:41 -0500 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 1xOhRN-00067h-P5 for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:39 -0500 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-583-rNNLn0ZlOIW5eoSaQrhCbg-1; Wed, 04 Nov 2026 15:18:33 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 173F91955E97; Wed, 4 Nov 2026 20:18:30 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BE14D195604C; Wed, 4 Nov 2026 20:18:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823517; 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=LGa+HMdMyZp+fDqANZnP8jW3DD1gu9BvhH368Mvy95o=; b=SLtYLoMQ9UNWY9u8kLFA7yjBEIISxVCXP2zpn+tUjoITw5+6qIh+L+f3u+5+Aop6YsC+P0 jZLoJpmmWVrNTsEI38Rj7vHEqdOFKfav4mrcYvE0VbAhYK1vbmFgKyMYt4spLJvAKoDglS NN0IMCo3jOzMwJW27juMPNSwYDiN/vI= X-MC-Unique: rNNLn0ZlOIW5eoSaQrhCbg-1 X-Mimecast-MFC-AGG-ID: rNNLn0ZlOIW5eoSaQrhCbg_1793823510 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 15/25] trace: add missing newline in ftrace Rust format string Date: Wed, 4 Nov 2026 15:17:51 -0500 Message-ID: <20261104201802.11556-16-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823584376158500 From: Daniel P. Berrang=C3=A9 The ftrace_write() method expects the caller to provide the newline. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-16-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- scripts/tracetool/backend/ftrace.py | 2 +- tests/tracetool/all.rs | 4 ++-- tests/tracetool/ftrace.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backen= d/ftrace.py index ba2a0c83770..e304ef21999 100644 --- a/scripts/tracetool/backend/ftrace.py +++ b/scripts/tracetool/backend/ftrace.py @@ -45,7 +45,7 @@ def generate_h_backend_dstate(event, group): event_id=3D"TRACE_" + event.name.upper()) =20 def generate_rs(event, group): - out(' let format_string =3D c"%(fmt)s";', + out(' let format_string =3D c"%(fmt)s\\n";', ' unsafe {bindings::ftrace_write(format_string.as_ptr() as = *const c_char, %(args)s);}', fmt=3Dexpand_format_string(event.fmt, event.name + " "), args=3Devent.args.rust_call_varargs()) diff --git a/tests/tracetool/all.rs b/tests/tracetool/all.rs index 14afd86281e..f48bdf4aab5 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 =3D c"test_blah Blah context=3D%p filename=3D%s"; + let format_string =3D c"test_blah Blah context=3D%p filename=3D%s\= n"; unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_= char, _context /* as *mut () */, _filename.as_ptr());} let format_string =3D c"test_blah Blah context=3D%p filename=3D%s\= n"; if (unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) !=3D= 0 { @@ -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 =3D c"test_wibble Wibble context=3D%p value=3D%d= "; + let format_string =3D c"test_wibble Wibble context=3D%p value=3D%d= \n"; unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_= char, _context /* as *mut () */, _value /* as std::ffi::c_int */);} let format_string =3D c"test_wibble Wibble context=3D%p value=3D%d= \n"; if (unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) !=3D= 0 { diff --git a/tests/tracetool/ftrace.rs b/tests/tracetool/ftrace.rs index 39959d3fdd1..1ad13172b17 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 =3D c"test_blah Blah context=3D%p filename=3D%s"; + let format_string =3D c"test_blah Blah context=3D%p filename=3D%s\= n"; 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 =3D c"test_wibble Wibble context=3D%p value=3D%d= "; + let format_string =3D c"test_wibble Wibble context=3D%p value=3D%d= \n"; unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_= char, _context /* as *mut () */, _value /* as std::ffi::c_int */);} } } --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1793823548; cv=none; d=zohomail.com; s=zohoarc; b=MDR/LsbSYhQAlWBDfHdJFpFEK7iq/g0/Dn6YSwhX369Bn2eLPAO2UAHjjs1IbT19ZrOsEBJ6HMKbqqyaU1zwhqJdOqrzCZWhYWB2oBDX8bVqm/wzpSPNDA/cBTN/xNRLPWJYjZUdpHPgwfzmx3fJsFuG0TiYNscVVbRGeW/bXmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823548; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=j3nROunoF4CikVbyQLt/Mk8W5QtQdfAuIa85rpQ5scA=; b=TUMaMuOgNZdMy1URFFE0YuQkeHZijqonFxVaf4ytopW18YXhtGJl1PWpjwzoVWIyzJg5t34/CcJT3KFwuMlm98rYdnPRWSJBLaSfZ84YnlT6ERCnWu4/I+6j13ACfa9jSgwuSNSnwJ8MpjCSuXNo2f6S5peegdCc5yWzUc2R5dE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1793823548305171.27207183051644; Wed, 4 Nov 2026 12:19:08 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1472537.1680462 (Exim 4.92) (envelope-from ) id 1xOhRQ-00020g-I8; Wed, 04 Nov 2026 20:18:40 +0000 Received: by outflank-mailman (output) from mailman id 1472537.1680462; Wed, 04 Nov 2026 20:18:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRQ-0001wl-0j; Wed, 04 Nov 2026 20:18:40 +0000 Received: by outflank-mailman (input) for mailman id 1472537; Wed, 04 Nov 2026 20:18:37 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1xOhRN-0001XZ-H3 for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 20:18:37 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1xOhRM-007PCO-TH for xen-devel@lists.xenproject.org; Wed, 04 Nov 2026 21:18:36 +0100 Received: from [10.42.69.9] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6aeb9312-e002-0a2a0a5209dd-0a2a450997ac-22 for ; Wed, 04 Nov 2026 21:18:36 +0100 Received: from [170.10.133.124] (helo=us-smtp-delivery-124.mimecast.com) by tlsNG-bad1c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6aeb931b-be1a-0a2a45090019-aa0a857cb83f-3 for ; Wed, 04 Nov 2026 21:18:36 +0100 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-542-XnmutKvYO4KxXFQRP6T0vA-1; Wed, 04 Nov 2026 15:18:33 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5AABD1800610; Wed, 4 Nov 2026 20:18:31 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 106D51848D44; Wed, 4 Nov 2026 20:18:30 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=mimecast20190719 header.d=redhat.com header.i="@redhat.com" header.h="From:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823515; 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=j3nROunoF4CikVbyQLt/Mk8W5QtQdfAuIa85rpQ5scA=; b=IGh9+RKsTS8OSbM+Z+pC0cTU9uieecyvFxYbpqC9ZSMffRT66A3nxQmD6YYLjWBT7xpMH4 VkyhbDF26Vpc+ImGYBkKtoTx6NYsGIgVjTyDZ9/3rHecsnsDR1QwrraY1Jv+32+utjwZQZ r77749YXZOijuzz4088StE6MQdgG2to= X-MC-Unique: XnmutKvYO4KxXFQRP6T0vA-1 X-Mimecast-MFC-AGG-ID: XnmutKvYO4KxXFQRP6T0vA_1793823511 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 16/25] trace: eliminate dupe trace_event_get_state_dynamic_by_id() calls Date: Wed, 4 Nov 2026 15:17:52 -0500 Message-ID: <20261104201802.11556-17-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-MFC-PROC-ID: 62vJSNOYvI7lj5YEErOwgtr9Nj-3kvWLUo0xtxBA5jM_1793823511 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-bad1c0/1793823516-3A0C5034-5C1A1BD6/35/111497 X-purgate-type: clean X-purgate-size: 8670 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823549809158500 From: Daniel P. Berrang=C3=A9 Each backend generates the same trace_event_get_state_dynamic_by_id() call for the TRACE....DSTATE() macro body, so when multiple backends are enabled, the same check is repeated: #define TRACE_TEST_WIBBLE_BACKEND_DSTATE() ( \ QEMU_TEST_WIBBLE_ENABLED() || \ trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ tracepoint_enabled(qemu, test_wibble) || \ false) Expanding the use of the 'backend.check_trace_event_get_state' attr in the C header generator removes the duplication, in the same way that the Rust generator already does. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-17-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- tests/tracetool/all.h | 22 ++++++++-------------- scripts/tracetool/backend/__init__.py | 4 ++-- scripts/tracetool/backend/ftrace.py | 4 ---- scripts/tracetool/backend/log.py | 4 ---- scripts/tracetool/backend/simple.py | 5 ----- scripts/tracetool/backend/syslog.py | 4 ---- scripts/tracetool/format/h.py | 8 +++++++- 7 files changed, 17 insertions(+), 34 deletions(-) diff --git a/tests/tracetool/all.h b/tests/tracetool/all.h index 41fa4d0e8a2..5627c1d8930 100644 --- a/tests/tracetool/all.h +++ b/tests/tracetool/all.h @@ -44,11 +44,8 @@ void _simple_trace_test_wibble(void *context, int value); =20 #define TRACE_TEST_BLAH_BACKEND_DSTATE() ( \ QEMU_TEST_BLAH_ENABLED() || \ - trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) || \ - trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) || \ - trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) || \ - trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) || \ tracepoint_enabled(qemu, test_blah) || \ + trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) || \ false) =20 static inline void trace_test_blah(void *context, const char *filename) @@ -58,26 +55,23 @@ static inline void trace_test_blah(void *context, const= char *filename) if (trace_event_get_state(TRACE_TEST_BLAH)) { #line 4 "trace-events" ftrace_write("test_blah " "Blah context=3D%p filename=3D%s" "\n" ,= context, filename); -#line 62 "all.h" +#line 59 "all.h" if (qemu_loglevel_mask(LOG_TRACE)) { #line 4 "trace-events" qemu_log("test_blah " "Blah context=3D%p filename=3D%s" "\n", = context, filename); -#line 66 "all.h" +#line 63 "all.h" } _simple_trace_test_blah(context, filename); #line 4 "trace-events" syslog(LOG_INFO, "test_blah " "Blah context=3D%p filename=3D%s" , = context, filename); -#line 71 "all.h" +#line 68 "all.h" } } =20 #define TRACE_TEST_WIBBLE_BACKEND_DSTATE() ( \ QEMU_TEST_WIBBLE_ENABLED() || \ - trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ - trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ - trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ - trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ tracepoint_enabled(qemu, test_wibble) || \ + trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ false) =20 static inline void trace_test_wibble(void *context, int value) @@ -87,16 +81,16 @@ static inline void trace_test_wibble(void *context, int= value) if (trace_event_get_state(TRACE_TEST_WIBBLE)) { #line 5 "trace-events" ftrace_write("test_wibble " "Wibble context=3D%p value=3D%d" "\n" = , context, value); -#line 91 "all.h" +#line 85 "all.h" if (qemu_loglevel_mask(LOG_TRACE)) { #line 5 "trace-events" qemu_log("test_wibble " "Wibble context=3D%p value=3D%d" "\n",= context, value); -#line 95 "all.h" +#line 89 "all.h" } _simple_trace_test_wibble(context, value); #line 5 "trace-events" syslog(LOG_INFO, "test_wibble " "Wibble context=3D%p value=3D%d" ,= context, value); -#line 100 "all.h" +#line 94 "all.h" } } #endif /* TRACE_TESTSUITE_GENERATED_TRACERS_H */ diff --git a/scripts/tracetool/backend/__init__.py b/scripts/tracetool/back= end/__init__.py index 9109a783c72..72f549c77c4 100644 --- a/scripts/tracetool/backend/__init__.py +++ b/scripts/tracetool/backend/__init__.py @@ -133,8 +133,8 @@ def generate_begin(self, events, group): def generate(self, event, group, check_trace_event_get_state=3DNone): self._run_function("generate_%s", event, group, check_trace_event_= get_state=3Dcheck_trace_event_get_state) =20 - def generate_backend_dstate(self, event, group): - self._run_function("generate_%s_backend_dstate", event, group) + def generate_backend_dstate(self, event, group, check_trace_event_get_= state=3DNone): + self._run_function("generate_%s_backend_dstate", event, group, che= ck_trace_event_get_state=3Dcheck_trace_event_get_state) =20 def generate_end(self, events, group): self._run_function("generate_%s_end", events, group) diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backen= d/ftrace.py index e304ef21999..94cffc45a9d 100644 --- a/scripts/tracetool/backend/ftrace.py +++ b/scripts/tracetool/backend/ftrace.py @@ -40,10 +40,6 @@ def generate_h(event, group): argnames=3Dargnames) =20 =20 -def generate_h_backend_dstate(event, group): - out(' trace_event_get_state_dynamic_by_id(%(event_id)s) || \\', - event_id=3D"TRACE_" + event.name.upper()) - def generate_rs(event, group): out(' let format_string =3D c"%(fmt)s\\n";', ' unsafe {bindings::ftrace_write(format_string.as_ptr() as = *const c_char, %(args)s);}', diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/l= og.py index 9e3e5046f5f..577ee158584 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -41,10 +41,6 @@ def generate_h(event, group): argnames=3Dargnames) =20 =20 -def generate_h_backend_dstate(event, group): - out(' trace_event_get_state_dynamic_by_id(%(event_id)s) || \\', - event_id=3D"TRACE_" + event.name.upper()) - def generate_rs(event, group): out(' let format_string =3D c"%(fmt)s\\n";', ' if (unsafe { bindings::qemu_loglevel } & bindings::LOG_TR= ACE) !=3D 0 {', diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backen= d/simple.py index e22683c7d2a..15f27e26bd5 100644 --- a/scripts/tracetool/backend/simple.py +++ b/scripts/tracetool/backend/simple.py @@ -42,11 +42,6 @@ def generate_h(event, group): args=3D", ".join(event.args.names())) =20 =20 -def generate_h_backend_dstate(event, group): - out(' trace_event_get_state_dynamic_by_id(%(event_id)s) || \\', - event_id=3D"TRACE_" + event.name.upper()) - - def generate_c_begin(events, group): out('#include "trace/simple.h"', '') diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backen= d/syslog.py index 746efd35fb9..ba269cb6a33 100644 --- a/scripts/tracetool/backend/syslog.py +++ b/scripts/tracetool/backend/syslog.py @@ -43,7 +43,3 @@ def generate_rs(event, group): ' unsafe {::trace::syslog(::trace::LOG_INFO, format_string.= as_ptr() as *const c_char, %(args)s);}', fmt=3Dexpand_format_string(event.fmt, event.name + " "), args=3Devent.args.rust_call_varargs()) - -def generate_h_backend_dstate(event, group): - out(' trace_event_get_state_dynamic_by_id(%(event_id)s) || \\', - event_id=3D"TRACE_" + event.name.upper()) diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index 6ffb7256e31..5ad3a419f82 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -55,7 +55,13 @@ def generate(events, backend, group): api=3De.api(e.QEMU_BACKEND_DSTATE)) =20 if "disable" not in e.properties: - backend.generate_backend_dstate(e, group) + backend.generate_backend_dstate(e, group, check_trace_event_ge= t_state=3DFalse) + + if backend.check_trace_event_get_state: + event_id =3D 'TRACE_' + e.name.upper() + out(' trace_event_get_state_dynamic_by_id(%(event_id)s)= || \\', + event_id=3Devent_id) + backend.generate_backend_dstate(e, group, check_trace_even= t_get_state=3DTrue) =20 out(' false)') =20 --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823659; cv=none; d=zohomail.com; s=zohoarc; b=THNtbycMU1gzcdcjUcA3XBDNp+viPzZ2NGZ79QRvSnrXKR1Ui39VTii0ZfC9KyMDudTKWhvlt3iDEQ7QhEKLutGdsOdLKiwzFsLPGaCnDIT8/3PxDsT+ZfQG54VP1edYfpJiQWxVtrnygcTeClGaj9U3UTumux+N/cJZuiUznfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823659; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MMzIqwZzfLbxitsjp49xs/Ty7Ev+lHRLVyhej1u9jzk=; b=Ci3F3DavW69eX8DfYKOMT6gw7WyHDs3qMlbIuKc7DZvSWQBuzM0ZAE/Djrv4w1QVnPxOajESdIDzB+shLsiTNrADSlc96vSoL4Rj06n/ss8mcebYp/EtBOva3RmbTlK5YXUY6p+GdmT0pok11AKr5fKfiXouKY1gsbyu2n9Vm4o= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1793823659722635.7430226950413; Wed, 4 Nov 2026 12:20:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRf-0007A7-0O; Wed, 04 Nov 2026 15:18:55 -0500 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 1xOhRR-00071R-O1 for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:43 -0500 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 1xOhRQ-000681-68 for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:41 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-117-NQIBVkeeM3W-CF4SunFbPQ-1; Wed, 04 Nov 2026 15:18:35 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 50E0C1800556; Wed, 4 Nov 2026 20:18:33 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 46E4E1956089; Wed, 4 Nov 2026 20:18:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823518; 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=MMzIqwZzfLbxitsjp49xs/Ty7Ev+lHRLVyhej1u9jzk=; b=IQRWiRWkNy5haYPx6aAE+H6XCFrTX4RVZb4gdQYLwN/FCZXOG9jxxx9cvVHhXn5btm2GKm LO9w1DNROLpZ/7asK9ZL/xIjBAI4je4qP+hbi1QVf69ZVFSdZoGDUxIXaaxp781mgCA1oP yC3cIkf65vjQstk5Aynj8d1x3B7JE28= X-MC-Unique: NQIBVkeeM3W-CF4SunFbPQ-1 X-Mimecast-MFC-AGG-ID: NQIBVkeeM3W-CF4SunFbPQ_1793823513 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL v2 17/25] audio: remove mistaken use of trace_event_get_state() Date: Wed, 4 Nov 2026 15:17:53 -0500 Message-ID: <20261104201802.11556-18-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1793823661791158500 From: Daniel P. Berrang=C3=A9 Conditional checks must call trace_event_get_state_backends() which checks the state of all backends (dtrace, ftrace, log, syslog, simple & ust), while trace_event_get_state() only validates state for backends using QEMU's internal state tracking (ftrace, log, syslog, simple). Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-18-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- audio/audio-mixeng-be.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/audio-mixeng-be.c b/audio/audio-mixeng-be.c index f6fd5014e0e..815d4fad2f5 100644 --- a/audio/audio-mixeng-be.c +++ b/audio/audio-mixeng-be.c @@ -1179,7 +1179,7 @@ void audio_run(AudioMixengBackend *s, const char *msg) audio_run_in(s); audio_run_capture(s); =20 - if (trace_event_get_state(TRACE_AUDIO_RUN_POLL)) { + if (trace_event_get_state_backends(TRACE_AUDIO_RUN_POLL)) { /* Convert seconds to microseconds for trace event */ int64_t elapsed_us =3D g_timer_elapsed(s->run_timer, NULL) * MICRO= SECONDS_PER_SECOND; trace_audio_run_poll(msg, elapsed_us); --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823754; cv=none; d=zohomail.com; s=zohoarc; b=QSCWvAJ8Gw34Rfo+XY7tRPEX2u+aQQ1zrHyudUxlZBWk/WYmNGAC9vkDM9sg9xZ/Lt/47ZkK9lK8ciZA0AFlYOWBTLnRoeWgEXP076FfKwt59mKe01J9wfn5z99gJqUchksrIXRmHMlCn2xF2vEdUkQK2bk9pySA7VsKqY3CNJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823754; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4/XTSFHkdQ+Pw5IV0/sk+ny/n4mSrenG0IJ4ieTlAdY=; b=gAHyrtscUoq8yVNELIiKqxXnAG002xPibE7ZvtpI5tJ7YDZFdy3+Pdan+FiRu2zhyVJ8HkUuiFFGasnj/wFsCqBsVtYOdTVHgrTXrp1T5QKC2rYlzZKtpjFKSnWgMRQ20nOLHml82i9YX+rcUd5GozhylstKdGWUW7IAxLfpj24= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 179382375497794.16654981651698; Wed, 4 Nov 2026 12:22:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRg-0007C1-4b; Wed, 04 Nov 2026 15:18:56 -0500 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 1xOhRT-000729-Jj for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:45 -0500 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 1xOhRQ-00068L-7n for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:42 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-675-zdS2rWdHNv-Xv-3HeQGrHg-1; Wed, 04 Nov 2026 15:18:36 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9307C1800547; Wed, 4 Nov 2026 20:18:34 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 44EF21829C21; Wed, 4 Nov 2026 20:18:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823519; 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=4/XTSFHkdQ+Pw5IV0/sk+ny/n4mSrenG0IJ4ieTlAdY=; b=Ds1qL345hwgOrMM4YfB8QOS0Z4sMNTpLF5MS8jq1POVUStfk09x+IRJRVwoz/0LjeJipoF J8bJdPb9cV5yv9gMVs5QQErpgiTsvGbthgyKNPsaHPxW4Vm5lbc3LaleZFt5g1d3Gg0mFc Fli+Uc1ferw4J1Nf1PHrDMDAZ6PJd6c= X-MC-Unique: zdS2rWdHNv-Xv-3HeQGrHg-1 X-Mimecast-MFC-AGG-ID: zdS2rWdHNv-Xv-3HeQGrHg_1793823514 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL v2 18/25] hw/ppc: remove mistaken use of trace_event_get_state() Date: Wed, 4 Nov 2026 15:17:54 -0500 Message-ID: <20261104201802.11556-19-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823755592158500 From: Daniel P. Berrang=C3=A9 Conditional checks must call trace_event_get_state_backends() which checks the state of all backends (dtrace, ftrace, log, syslog, simple & ust), while trace_event_get_state() only validates state for backends using QEMU's internal state tracking (ftrace, log, syslog, simple). Furthermore, checking qemu_loglevel_mask() is inappropriate since there are many trace backends, of which 'log' is only one. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-19-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- hw/ppc/vof.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/ppc/vof.c b/hw/ppc/vof.c index 873e967f1e4..e2ff9bf96a3 100644 --- a/hw/ppc/vof.c +++ b/hw/ppc/vof.c @@ -252,8 +252,7 @@ static uint32_t vof_getprop(const void *fdt, uint32_t n= odeph, uint32_t pname, */ ret =3D proplen; /* Do not format a value if tracepoint is silent, for performa= nce */ - if (trace_event_get_state(TRACE_VOF_GETPROP) && - qemu_loglevel_mask(LOG_TRACE)) { + if (trace_event_get_state_backends(TRACE_VOF_GETPROP)) { prop_format(trval, sizeof(trval), prop, ret); } } @@ -337,8 +336,7 @@ static uint32_t vof_setprop(MachineState *ms, void *fdt= , Vof *vof, goto trace_exit; } =20 - if (trace_event_get_state(TRACE_VOF_SETPROP) && - qemu_loglevel_mask(LOG_TRACE)) { + if (trace_event_get_state_backends(TRACE_VOF_SETPROP)) { prop_format(trval, sizeof(trval), val, vallen); } ret =3D vallen; @@ -584,8 +582,7 @@ static uint32_t vof_write(Vof *vof, uint32_t ihandle, u= int32_t buf, } =20 /* FIXME: there is no backend(s) yet so just call a trace */ - if (trace_event_get_state(TRACE_VOF_WRITE) && - qemu_loglevel_mask(LOG_TRACE)) { + if (trace_event_get_state_backends(TRACE_VOF_WRITE)) { tmp[cb] =3D '\0'; trace_vof_write(ihandle, cb, tmp); } @@ -599,9 +596,7 @@ static void vof_claimed_dump(GArray *claimed) int i; OfClaimed c; =20 - if (trace_event_get_state(TRACE_VOF_CLAIMED) && - qemu_loglevel_mask(LOG_TRACE)) { - + if (trace_event_get_state_backends(TRACE_VOF_CLAIMED)) { for (i =3D 0; i < claimed->len; ++i) { c =3D g_array_index(claimed, OfClaimed, i); trace_vof_claimed(c.start, c.start + c.size, c.size); --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823704; cv=none; d=zohomail.com; s=zohoarc; b=cF3tryLJcl9JSu3wF1912Bh5+sFtlQcAeeYsZursbWNBPgNf+7bqAb0VxdoV2X+7ZciCnQcJB+AdtQCYSw+AvAPrk7QxiFDXKLvMHe/aN6rbgjhBDIzNhBqDmC7SK7EvKxlKQFUEQFghVihHzFU9K+LbMhLc25mbC1voyr6YK0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823704; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Uufc4nv38yI9zDdiGbNpg4ZIN69J3LElu5ZGq15CX2Y=; b=lfO0RIN06+cNnmE9csHQUpMoa2f/lJwbNzZz4sBnEAoQ2Y8n/1euHp89JTevuGMVGAlHxd6rxD3ZAL57evbfLxWpaRIU4NiQngSzuFGX5Vu9kfaPfyXP0FuHrPfMSJMHjSA4lUnvrVaUMGOaU2oD/oCf94V/LER/HDJ3WMPyr2s= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 179382370429184.71887781015982; Wed, 4 Nov 2026 12:21:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRh-0007Co-FR; Wed, 04 Nov 2026 15:18:57 -0500 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 1xOhRT-000728-Jd for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:45 -0500 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 1xOhRR-00068m-14 for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:42 -0500 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-695-8gi46V3fPbuorzIqtOGZcA-1; Wed, 04 Nov 2026 15:18:37 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 C696A1956055; Wed, 4 Nov 2026 20:18:35 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7AEE11848D40; Wed, 4 Nov 2026 20:18:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823520; 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=Uufc4nv38yI9zDdiGbNpg4ZIN69J3LElu5ZGq15CX2Y=; b=VMqSnzMnsrLR2mlc3qXu7nTmeB5FT1/gkfv/ZXAP32oN55sgZg82BQzvzrlsiBRyupuvzn 76P7pkkPLzzNvnLvNkcRA8LDvxGPWljwMKHlDJaNpswu0JJ5EfS5Z32BDYtsr1JrOo6khT rPugs2b9JT07YuCDZA474a0fWKj18dA= X-MC-Unique: 8gi46V3fPbuorzIqtOGZcA-1 X-Mimecast-MFC-AGG-ID: 8gi46V3fPbuorzIqtOGZcA_1793823515 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 19/25] monitor: remove mistaken use of trace_event_get_state() Date: Wed, 4 Nov 2026 15:17:55 -0500 Message-ID: <20261104201802.11556-20-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823706615158500 From: Daniel P. Berrang=C3=A9 Conditional checks must call trace_event_get_state_backends() which checks the state of all backends (dtrace, ftrace, log, syslog, simple & ust), while trace_event_get_state() only validates state for backends using QEMU's internal state tracking (ftrace, log, syslog, simple). Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-20-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- monitor/qmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monitor/qmp.c b/monitor/qmp.c index d2e45d3993b..2f66257e4ad 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -440,7 +440,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) =20 /* Process request */ if (req_obj->req) { - if (trace_event_get_state(TRACE_MONITOR_QMP_CMD_IN_BAND)) { + if (trace_event_get_state_backends(TRACE_MONITOR_QMP_CMD_IN_BA= ND)) { QDict *qdict =3D qobject_to(QDict, req_obj->req); QObject *id =3D qdict ? qdict_get(qdict, "id") : NULL; GString *id_json; @@ -496,7 +496,7 @@ static void handle_qmp_command(void *opaque, QObject *r= eq, Error *err) =20 if (qdict && qmp_is_oob(qdict)) { /* OOB commands are executed immediately */ - if (trace_event_get_state(TRACE_MONITOR_QMP_CMD_OUT_OF_BAND)) { + if (trace_event_get_state_backends(TRACE_MONITOR_QMP_CMD_OUT_OF_BA= ND)) { QObject *id =3D qdict_get(qdict, "id"); GString *id_json; =20 --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823695; cv=none; d=zohomail.com; s=zohoarc; b=NR3Hgxq78ozV0yIPYsimPr+1LMrVN4pmsAd7T5noULhr/6bZmFHfIKdQ5gJ3ym1V0n4MPyancbAiYyyGA9eKY5pev0CMmbUBPWlVe29Fd8laW8urVSt3oX3kSEHvzPf3NIosmmdvAiz4efVMx1lXCFM685YYpBNQIbFm5PzsPGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823695; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qET1C5bDfM2VhuVuw7XPqzaGlvXdrrKHqoGPXvja8g8=; b=UC+HYNcsaAoGsmCaJycsYBB2Hgf7H5DxRFSUTDQ6ZBfjaSR2ZiLvYW7mtIICSIcHsuPal9P75DEG5V5/ZcCwvrkZsnyu97+mAWqqRVZCs74IEHqWt926vr1qkhiiePB7oGHWkMxmTrhihx6Ac8+ebcO0IsEqvcQcJZSzLmbSVps= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1793823695419928.1009551984552; Wed, 4 Nov 2026 12:21:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRi-0007E4-MH; Wed, 04 Nov 2026 15:18:58 -0500 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 1xOhRW-000731-8l for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:46 -0500 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 1xOhRU-00069T-10 for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:46 -0500 Received: from mx-prod-mc-01.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-677-lZ5o66JzNnSHg7pQePNiqg-1; Wed, 04 Nov 2026 15:18:39 -0500 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 87E481955E9C; Wed, 4 Nov 2026 20:18:37 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C718D301D916; Wed, 4 Nov 2026 20:18:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823523; 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=qET1C5bDfM2VhuVuw7XPqzaGlvXdrrKHqoGPXvja8g8=; b=N2h7B11F4RKWDyXjyHccLudYbubVTwn73+aGG/xHA70/jsoHjwBvbIojiXI+QT+wk/8GRp e+oUi0MHA3czkX6WcBGMYqGLtgdImlpu5YOHyTDatGShKQTNtjfeIpFP9Q2M/Awr6Rx8w9 18t8CGLfPSN9AK0XTnG37iApI8c66ak= X-MC-Unique: lZ5o66JzNnSHg7pQePNiqg-1 X-Mimecast-MFC-AGG-ID: lZ5o66JzNnSHg7pQePNiqg_1793823517 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 20/25] trace: include qemu_loglevel_mask(LOG_TRACE) in guard Date: Wed, 4 Nov 2026 15:17:56 -0500 Message-ID: <20261104201802.11556-21-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823696518158500 From: Daniel P. Berrang=C3=A9 If emitting a trace event requires computation for the parameters passed to the probe, the callers should guard that computation with trace_event_by_state_backends(), which is a macro expanding to a check of the "TRACE_...._DSTATE()" expression. For the log backend this should include a check for LOG_TRACE being present in the configured log level. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/tracetool/all.h | 34 +++++++++++++++++++------------- tests/tracetool/log.h | 20 +++++++++---------- scripts/tracetool/backend/log.py | 24 +++++++++++++++++----- tests/tracetool/all.rs | 16 +++++++++++---- tests/tracetool/log.rs | 6 ++++-- 5 files changed, 65 insertions(+), 35 deletions(-) diff --git a/tests/tracetool/all.h b/tests/tracetool/all.h index 5627c1d8930..0ae2598eb1d 100644 --- a/tests/tracetool/all.h +++ b/tests/tracetool/all.h @@ -44,6 +44,8 @@ void _simple_trace_test_wibble(void *context, int value); =20 #define TRACE_TEST_BLAH_BACKEND_DSTATE() ( \ QEMU_TEST_BLAH_ENABLED() || \ + (trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) && \ + qemu_loglevel_mask(LOG_TRACE)) || \ tracepoint_enabled(qemu, test_blah) || \ trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) || \ false) @@ -51,25 +53,28 @@ void _simple_trace_test_wibble(void *context, int value= ); static inline void trace_test_blah(void *context, const char *filename) { QEMU_TEST_BLAH(context, filename); + if (trace_event_get_state(TRACE_TEST_BLAH) && + qemu_loglevel_mask(LOG_TRACE)) { +#line 4 "trace-events" + qemu_log("test_blah " "Blah context=3D%p filename=3D%s" "\n", = context, filename); +#line 61 "all.h" + } tracepoint(qemu, test_blah, context, filename); if (trace_event_get_state(TRACE_TEST_BLAH)) { #line 4 "trace-events" ftrace_write("test_blah " "Blah context=3D%p filename=3D%s" "\n" ,= context, filename); -#line 59 "all.h" - if (qemu_loglevel_mask(LOG_TRACE)) { -#line 4 "trace-events" - qemu_log("test_blah " "Blah context=3D%p filename=3D%s" "\n", = context, filename); -#line 63 "all.h" - } +#line 67 "all.h" _simple_trace_test_blah(context, filename); #line 4 "trace-events" syslog(LOG_INFO, "test_blah " "Blah context=3D%p filename=3D%s" , = context, filename); -#line 68 "all.h" +#line 71 "all.h" } } =20 #define TRACE_TEST_WIBBLE_BACKEND_DSTATE() ( \ QEMU_TEST_WIBBLE_ENABLED() || \ + (trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) && \ + qemu_loglevel_mask(LOG_TRACE)) || \ tracepoint_enabled(qemu, test_wibble) || \ trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ false) @@ -77,20 +82,21 @@ static inline void trace_test_blah(void *context, const= char *filename) static inline void trace_test_wibble(void *context, int value) { QEMU_TEST_WIBBLE(context, value); + if (trace_event_get_state(TRACE_TEST_WIBBLE) && + qemu_loglevel_mask(LOG_TRACE)) { +#line 5 "trace-events" + qemu_log("test_wibble " "Wibble context=3D%p value=3D%d" "\n",= context, value); +#line 90 "all.h" + } tracepoint(qemu, test_wibble, context, value); if (trace_event_get_state(TRACE_TEST_WIBBLE)) { #line 5 "trace-events" ftrace_write("test_wibble " "Wibble context=3D%p value=3D%d" "\n" = , context, value); -#line 85 "all.h" - if (qemu_loglevel_mask(LOG_TRACE)) { -#line 5 "trace-events" - qemu_log("test_wibble " "Wibble context=3D%p value=3D%d" "\n",= context, value); -#line 89 "all.h" - } +#line 96 "all.h" _simple_trace_test_wibble(context, value); #line 5 "trace-events" syslog(LOG_INFO, "test_wibble " "Wibble context=3D%p value=3D%d" ,= context, value); -#line 94 "all.h" +#line 100 "all.h" } } #endif /* TRACE_TESTSUITE_GENERATED_TRACERS_H */ diff --git a/tests/tracetool/log.h b/tests/tracetool/log.h index ff510d54908..9957a854c00 100644 --- a/tests/tracetool/log.h +++ b/tests/tracetool/log.h @@ -16,32 +16,32 @@ extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; =20 =20 #define TRACE_TEST_BLAH_BACKEND_DSTATE() ( \ - trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) || \ + (trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) && \ + qemu_loglevel_mask(LOG_TRACE)) || \ false) =20 static inline void trace_test_blah(void *context, const char *filename) { - if (trace_event_get_state(TRACE_TEST_BLAH)) { - if (qemu_loglevel_mask(LOG_TRACE)) { + if (trace_event_get_state(TRACE_TEST_BLAH) && + qemu_loglevel_mask(LOG_TRACE)) { #line 4 "trace-events" qemu_log("test_blah " "Blah context=3D%p filename=3D%s" "\n", = context, filename); -#line 29 "log.h" - } +#line 30 "log.h" } } =20 #define TRACE_TEST_WIBBLE_BACKEND_DSTATE() ( \ - trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) || \ + (trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) && \ + qemu_loglevel_mask(LOG_TRACE)) || \ false) =20 static inline void trace_test_wibble(void *context, int value) { - if (trace_event_get_state(TRACE_TEST_WIBBLE)) { - if (qemu_loglevel_mask(LOG_TRACE)) { + if (trace_event_get_state(TRACE_TEST_WIBBLE) && + qemu_loglevel_mask(LOG_TRACE)) { #line 5 "trace-events" qemu_log("test_wibble " "Wibble context=3D%p value=3D%d" "\n",= context, value); -#line 44 "log.h" - } +#line 45 "log.h" } } #endif /* TRACE_TESTSUITE_GENERATED_TRACERS_H */ diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/l= og.py index 577ee158584..0e7909efe8b 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -16,7 +16,6 @@ =20 =20 PUBLIC =3D True -CHECK_TRACE_EVENT_GET_STATE =3D True =20 =20 def generate_h_begin(events, group): @@ -29,11 +28,13 @@ def generate_h(event, group): if len(event.args) > 0: argnames =3D ", " + argnames =20 - out(' if (qemu_loglevel_mask(LOG_TRACE)) {', + out(' if (trace_event_get_state(%(event_id)s) &&', + ' qemu_loglevel_mask(LOG_TRACE)) {', '#line %(event_lineno)d "%(event_filename)s"', ' qemu_log("%(name)s " %(fmt)s "\\n"%(argnames)s);', '#line %(out_next_lineno)d "%(out_filename)s"', - ' }', + ' }', + event_id=3D"TRACE_" + event.name.upper(), event_lineno=3Devent.lineno, event_filename=3Devent.filename, name=3Devent.name, @@ -41,10 +42,23 @@ def generate_h(event, group): argnames=3Dargnames) =20 =20 +def generate_h_backend_dstate(event, group): + out(' (trace_event_get_state_dynamic_by_id(%(event_id)s) && \\', + ' qemu_loglevel_mask(LOG_TRACE)) || \\', + event_id=3D"TRACE_" + event.name.upper()) + def generate_rs(event, group): - out(' let format_string =3D c"%(fmt)s\\n";', + out(' if trace_event_state_is_enabled(unsafe { _%(event_id)s_DSTATE= }) {', + ' let format_string =3D c"%(fmt)s\\n";', ' if (unsafe { bindings::qemu_loglevel } & bindings::LOG_TR= ACE) !=3D 0 {', ' unsafe { bindings::qemu_log(format_string.as_ptr() as= *const c_char, %(args)s);}', ' }', + ' }', fmt=3Dexpand_format_string(event.fmt, event.name + " "), - args=3Devent.args.rust_call_varargs()) + args=3Devent.args.rust_call_varargs(), + event_id=3D"TRACE_" + event.name.upper()) + +def generate_rs_backend_dstate(event, group): + out(' ((unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) != =3D 0 &&', + ' trace_event_state_is_enabled(unsafe { _%(event_id)s_DSTATE})= ) ||', + event_id=3D"TRACE_" + event.name.upper()) diff --git a/tests/tracetool/all.rs b/tests/tracetool/all.rs index f48bdf4aab5..eb94d5c62a5 100644 --- a/tests/tracetool/all.rs +++ b/tests/tracetool/all.rs @@ -37,6 +37,8 @@ fn trace_event_state_is_enabled(dstate: u8) -> bool { pub fn trace_test_blah_enabled() -> bool { (unsafe {qemu_test_blah_semaphore.get().read_volatile()}) !=3D 0 || + ((unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) !=3D 0 && + trace_event_state_is_enabled(unsafe { _TRACE_TEST_BLAH_DSTATE})) || trace_event_state_is_enabled(unsafe { _TRACE_TEST_BLAH_DSTATE}) || false } @@ -47,12 +49,14 @@ pub fn trace_test_blah(_context: *mut (), _filename: &s= td::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 =3D c"test_blah Blah context=3D%p filename=3D%s\= n"; - unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_= char, _context /* as *mut () */, _filename.as_ptr());} let format_string =3D c"test_blah Blah context=3D%p filename=3D%s\= n"; if (unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) !=3D= 0 { unsafe { bindings::qemu_log(format_string.as_ptr() as *const c= _char, _context /* as *mut () */, _filename.as_ptr());} } + } + if trace_event_state_is_enabled(unsafe { _TRACE_TEST_BLAH_DSTATE}) { + let format_string =3D c"test_blah Blah context=3D%p filename=3D%s\= n"; + unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_= char, _context /* as *mut () */, _filename.as_ptr());} extern "C" { fn _simple_trace_test_blah(_context: *mut (), _filena= me: *const std::ffi::c_char); } unsafe { _simple_trace_test_blah(_context, _filename.as_ptr()); } let format_string =3D c"test_blah Blah context=3D%p filename=3D%s"; @@ -65,6 +69,8 @@ pub fn trace_test_blah(_context: *mut (), _filename: &std= ::ffi::CStr) pub fn trace_test_wibble_enabled() -> bool { (unsafe {qemu_test_wibble_semaphore.get().read_volatile()}) !=3D 0 || + ((unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) !=3D 0 && + trace_event_state_is_enabled(unsafe { _TRACE_TEST_WIBBLE_DSTATE})) || trace_event_state_is_enabled(unsafe { _TRACE_TEST_WIBBLE_DSTATE}) || false } @@ -75,12 +81,14 @@ 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 =3D c"test_wibble Wibble context=3D%p value=3D%d= \n"; - unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_= char, _context /* as *mut () */, _value /* as std::ffi::c_int */);} let format_string =3D c"test_wibble Wibble context=3D%p value=3D%d= \n"; if (unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) !=3D= 0 { unsafe { bindings::qemu_log(format_string.as_ptr() as *const c= _char, _context /* as *mut () */, _value /* as std::ffi::c_int */);} } + } + if trace_event_state_is_enabled(unsafe { _TRACE_TEST_WIBBLE_DSTATE}) { + let format_string =3D c"test_wibble Wibble context=3D%p value=3D%d= \n"; + unsafe {bindings::ftrace_write(format_string.as_ptr() as *const c_= char, _context /* as *mut () */, _value /* as std::ffi::c_int */);} extern "C" { fn _simple_trace_test_wibble(_context: *mut (), _valu= e: std::ffi::c_int); } unsafe { _simple_trace_test_wibble(_context, _value); } let format_string =3D c"test_wibble Wibble context=3D%p value=3D%d= "; diff --git a/tests/tracetool/log.rs b/tests/tracetool/log.rs index 0f052bb2c9c..17597209b7c 100644 --- a/tests/tracetool/log.rs +++ b/tests/tracetool/log.rs @@ -27,7 +27,8 @@ fn trace_event_state_is_enabled(dstate: u8) -> bool { #[allow(dead_code)] pub fn trace_test_blah_enabled() -> bool { - trace_event_state_is_enabled(unsafe { _TRACE_TEST_BLAH_DSTATE}) || + ((unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) !=3D 0 && + trace_event_state_is_enabled(unsafe { _TRACE_TEST_BLAH_DSTATE})) || false } =20 @@ -47,7 +48,8 @@ pub fn trace_test_blah(_context: *mut (), _filename: &std= ::ffi::CStr) #[allow(dead_code)] pub fn trace_test_wibble_enabled() -> bool { - trace_event_state_is_enabled(unsafe { _TRACE_TEST_WIBBLE_DSTATE}) || + ((unsafe { bindings::qemu_loglevel } & bindings::LOG_TRACE) !=3D 0 && + trace_event_state_is_enabled(unsafe { _TRACE_TEST_WIBBLE_DSTATE})) || false } =20 --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823709; cv=none; d=zohomail.com; s=zohoarc; b=DEx8tttT1BCXrO4F//A19F6BugOgaLXKBIBN9ZCyoNqORLQD941FM8dKKHJjf5lhg6+IByqtF950WJ787nslAh4cOOoGGj7vGCoZacgFyiKtJAUXC5XQ0ZL2GdcWEZ2Atwa9tCfiGHJf+PZn8CxlaXTLkZMcI/I6EEHs0fBwobk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823709; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vbjdzJandTBXbN/NbJQon1SW3S6mArhMeBbnMOT68dI=; b=EUkrwj8//C/e3vW+xeQVvWOeUbQo6U9VNu8kP9rBIpAhS/5U7iqQfykwzDjkM/VjhLpUGwyP3ha+bUqCe4Q11nTqpVGPqmJopMksshi2fuVM8iBfOfizCxdGHVZ/HM3257xfHdHyy2nrwClUQbJurFpVoZcEcfmKxcsYg3C6jPE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1793823709784409.3834575743499; Wed, 4 Nov 2026 12:21:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRj-0007ET-CB; Wed, 04 Nov 2026 15:18:59 -0500 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 1xOhRX-00073L-4v for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xOhRU-00069g-Si for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:46 -0500 Received: from mx-prod-mc-01.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-92-VowBVlDvMFS89mrsGpqQ2g-1; Wed, 04 Nov 2026 15:18:40 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BAD431955F21; Wed, 4 Nov 2026 20:18:38 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6F7051955EB8; Wed, 4 Nov 2026 20:18:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823523; 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=vbjdzJandTBXbN/NbJQon1SW3S6mArhMeBbnMOT68dI=; b=f9INYYMzGfuxRUpNiZbNl9RCMWpVa4iRW9SkDk0MUfLr8FIpfIcAwOkqD5LQJlKqPuitry l2CfI1bMu57Lx2UHgRfyAqHZTcMmTVwsEhy1NiKCGcu83wTe4q5Bf83aI+ZQScQGQUEe6a 2RSGce1nOpaaY+koYGJQcZwOgD6cxHI= X-MC-Unique: VowBVlDvMFS89mrsGpqQ2g-1 X-Mimecast-MFC-AGG-ID: VowBVlDvMFS89mrsGpqQ2g_1793823518 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 21/25] target/hppa: use PRIx64 in trace-events Date: Wed, 4 Nov 2026 15:17:57 -0500 Message-ID: <20261104201802.11556-22-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823710824158500 From: Daniel P. Berrang=C3=A9 %lx is not portable to Windows platforms. This bug was not noticed since the trace events are annotated with 'disable', but this will be removed in the next commit. Addresses should also be prefixed with "0x". Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-22-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- target/hppa/trace-events | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/target/hppa/trace-events b/target/hppa/trace-events index 01761a4559b..9514f039f2d 100644 --- a/target/hppa/trace-events +++ b/target/hppa/trace-events @@ -1,19 +1,19 @@ # See docs/devel/tracing.rst for syntax documentation. =20 # mem_helper.c -disable hppa_tlb_flush_ent(void *env, void *ent, uint64_t va_b, uint64_t v= a_e, uint64_t pa) "env=3D%p ent=3D%p va_b=3D0x%lx va_e=3D0x%lx pa=3D0x%" PR= Ix64 -disable hppa_tlb_find_entry(void *env, void *ent, int valid, uint64_t va_b= , uint64_t va_e, uint64_t pa) "env=3D%p ent=3D%p valid=3D%d va_b=3D0x%lx va= _e=3D0x%lx pa=3D0x%" PRIx64 -disable hppa_tlb_find_entry_not_found(void *env, uint64_t addr) "env=3D%p = addr=3D%08lx" -disable hppa_tlb_get_physical_address(void *env, int ret, int prot, uint64= _t addr, uint64_t phys) "env=3D%p ret=3D%d prot=3D%d addr=3D0x%lx phys=3D0x= %lx" -disable hppa_tlb_fill_excp(void *env, uint64_t addr, int size, int type, i= nt mmu_idx) "env=3D%p addr=3D0x%lx size=3D%d type=3D%d mmu_idx=3D%d" -disable hppa_tlb_fill_success(void *env, uint64_t addr, uint64_t phys, int= size, int type, int mmu_idx) "env=3D%p addr=3D0x%lx phys=3D0x%lx size=3D%d= type=3D%d mmu_idx=3D%d" -disable hppa_tlb_itlba(void *env, void *ent, uint64_t va_b, uint64_t va_e,= uint64_t pa) "env=3D%p ent=3D%p va_b=3D0x%lx va_e=3D0x%lx pa=3D0x%" PRIx64 -disable hppa_tlb_itlbp(void *env, void *ent, int access_id, int u, int pl2= , int pl1, int type, int b, int d, int t) "env=3D%p ent=3D%p access_id=3D%x= u=3D%d pl2=3D%d pl1=3D%d type=3D%d b=3D%d d=3D%d t=3D%d" +disable hppa_tlb_flush_ent(void *env, void *ent, uint64_t va_b, uint64_t v= a_e, uint64_t pa) "env=3D%p ent=3D%p va_b=3D0x%" PRIx64 " va_e=3D0x%" PRIx6= 4 " pa=3D0x%" PRIx64 +disable hppa_tlb_find_entry(void *env, void *ent, int valid, uint64_t va_b= , uint64_t va_e, uint64_t pa) "env=3D%p ent=3D%p valid=3D%d va_b=3D0x%" PRI= x64 " va_e=3D0x%" PRIx64 " pa=3D0x%" PRIx64 +disable hppa_tlb_find_entry_not_found(void *env, uint64_t addr) "env=3D%p = addr=3D0x%" PRIx64 +disable hppa_tlb_get_physical_address(void *env, int ret, int prot, uint64= _t addr, uint64_t phys) "env=3D%p ret=3D%d prot=3D%d addr=3D0x%" PRIx64 " p= hys=3D0x%" PRIx64 "" +disable hppa_tlb_fill_excp(void *env, uint64_t addr, int size, int type, i= nt mmu_idx) "env=3D%p addr=3D0x%" PRIx64 " size=3D%d type=3D%d mmu_idx=3D%d" +disable hppa_tlb_fill_success(void *env, uint64_t addr, uint64_t phys, int= size, int type, int mmu_idx) "env=3D%p addr=3D0x%" PRIx64 " phys=3D0x%" PR= Ix64 " size=3D%d type=3D%d mmu_idx=3D%d" +disable hppa_tlb_itlba(void *env, void *ent, uint64_t va_b, uint64_t va_e,= uint64_t pa) "env=3D%p ent=3D%p va_b=3D0x%" PRIx64 " va_e=3D0x%" PRIx64 " = pa=3D0x%" PRIx64 +disable hppa_tlb_itlbp(void *env, void *ent, int access_id, int u, int pl2= , int pl1, int type, int b, int d, int t) "env=3D%p ent=3D%p access_id=3D0x= %x u=3D%d pl2=3D%d pl1=3D%d type=3D%d b=3D%d d=3D%d t=3D%d" disable hppa_tlb_ptlb(void *env) "env=3D%p" disable hppa_tlb_ptlb_local(void *env) "env=3D%p" disable hppa_tlb_ptlbe(void *env) "env=3D%p" -disable hppa_tlb_lpa_success(void *env, uint64_t addr, uint64_t phys) "env= =3D%p addr=3D0x%lx phys=3D0x%lx" -disable hppa_tlb_lpa_failed(void *env, uint64_t addr) "env=3D%p addr=3D0x%= lx" +disable hppa_tlb_lpa_success(void *env, uint64_t addr, uint64_t phys) "env= =3D%p addr=3D0x%" PRIx64 " phys=3D0x%" PRIx64 "" +disable hppa_tlb_lpa_failed(void *env, uint64_t addr) "env=3D%p addr=3D0x%= " PRIx64 "" =20 # op_helper.c -disable hppa_tlb_probe(uint64_t addr, int level, int want) "addr=3D0x%lx l= evel=3D%d want=3D%d" +disable hppa_tlb_probe(uint64_t addr, int level, int want) "addr=3D0x%" PR= Ix64 " level=3D%d want=3D%d" --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823730; cv=none; d=zohomail.com; s=zohoarc; b=lKGDe4Z6ReJpTm1RS2Yvi9BxaF0HfCcue7rYBAFdxCBS1IM/L5bW+xQDZ77EavUY4YOJNmJUGqZNxQS3egsOQQIgYFrV0pwj0lD/F9ZJT2zgahtqSQNgwHPGs3FQVut3Ic2MoEnfOzPF0Wit53sA0GwIPq3n6GOwDGO8fpu77S0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823730; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bzIJc3V05DowmcLi7i1y5B9HyXtVMAI3zmPBHgeliGU=; b=fOFsdh0psaMRKgYEhFQ8S1W89sasAxnYc1Wv/BrcfK5uvmvHNZPF+ESg7VK+EJdivBKAy7phvyhsOAWezlVVybgTlaGZIVJJCgnPEl5KZ+GbHYGeYZdVIzNsGOmxxNV2kVWChbp+4Yc4fG5+TVFWIkYBglcPz2jujPqfnK9T3cA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1793823730300625.2213969864921; Wed, 4 Nov 2026 12:22:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRg-0007C5-GK; Wed, 04 Nov 2026 15:18:56 -0500 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 1xOhRV-00072z-L5 for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:46 -0500 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 1xOhRT-00069L-V7 for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:45 -0500 Received: from mx-prod-mc-01.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-357-nseSXMS8MA6KZW1lD6Z7mg-1; Wed, 04 Nov 2026 15:18:42 -0500 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 22555195606F; Wed, 4 Nov 2026 20:18:40 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C59C7301D91B; Wed, 4 Nov 2026 20:18:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823523; 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=bzIJc3V05DowmcLi7i1y5B9HyXtVMAI3zmPBHgeliGU=; b=JfS7rzFEidDE7sGUf46aM5JV4Pax2Dt6c0alZPkhaBSHzJhEHJmbnZASIzajhOCtzXgISO ZA3YmDRymJV6MNbKXIfnzvJioHfT2/Ne60Tqf4eQzKM2Cr8kb+gW/WgrWjQLOAy3hO9mFP tVRllSq1k62uk2byqOP4es4Jea1KY3U= X-MC-Unique: nseSXMS8MA6KZW1lD6Z7mg-1 X-Mimecast-MFC-AGG-ID: nseSXMS8MA6KZW1lD6Z7mg_1793823520 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 22/25] trace: remove "disable" property from trace files Date: Wed, 4 Nov 2026 15:17:58 -0500 Message-ID: <20261104201802.11556-23-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823731108158500 From: Daniel P. Berrang=C3=A9 The scenarios are not significant enough to justify its use Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-23-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- hw/display/trace-events | 2 +- target/hppa/trace-events | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/hw/display/trace-events b/hw/display/trace-events index c5e7e42af23..223a085922b 100644 --- a/hw/display/trace-events +++ b/hw/display/trace-events @@ -60,7 +60,7 @@ virtio_gpu_dec_inflight_fences(uint32_t inflight) "in-fli= ght- %u" virtio_gpu_cmd_suspended(uint32_t cmd) "cmd 0x%x" =20 # qxl.c -disable qxl_io_write_vga(int qid, const char *mode, uint32_t addr, uint32_= t val) "%d %s addr=3D%u val=3D%u" +qxl_io_write_vga(int qid, const char *mode, uint32_t addr, uint32_t val) "= %d %s addr=3D%u val=3D%u" qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_= t mem, uint32_t format, uint32_t position) "%d %ux%u mem=3D0x%" PRIx64 " %u= ,%u" qxl_create_guest_primary_rest(int qid, int32_t stride, uint32_t type, uint= 32_t flags) "%d %d,%d,%d" qxl_destroy_primary(int qid) "%d" diff --git a/target/hppa/trace-events b/target/hppa/trace-events index 9514f039f2d..9fd37b1e2cb 100644 --- a/target/hppa/trace-events +++ b/target/hppa/trace-events @@ -1,19 +1,19 @@ # See docs/devel/tracing.rst for syntax documentation. =20 # mem_helper.c -disable hppa_tlb_flush_ent(void *env, void *ent, uint64_t va_b, uint64_t v= a_e, uint64_t pa) "env=3D%p ent=3D%p va_b=3D0x%" PRIx64 " va_e=3D0x%" PRIx6= 4 " pa=3D0x%" PRIx64 -disable hppa_tlb_find_entry(void *env, void *ent, int valid, uint64_t va_b= , uint64_t va_e, uint64_t pa) "env=3D%p ent=3D%p valid=3D%d va_b=3D0x%" PRI= x64 " va_e=3D0x%" PRIx64 " pa=3D0x%" PRIx64 -disable hppa_tlb_find_entry_not_found(void *env, uint64_t addr) "env=3D%p = addr=3D0x%" PRIx64 -disable hppa_tlb_get_physical_address(void *env, int ret, int prot, uint64= _t addr, uint64_t phys) "env=3D%p ret=3D%d prot=3D%d addr=3D0x%" PRIx64 " p= hys=3D0x%" PRIx64 "" -disable hppa_tlb_fill_excp(void *env, uint64_t addr, int size, int type, i= nt mmu_idx) "env=3D%p addr=3D0x%" PRIx64 " size=3D%d type=3D%d mmu_idx=3D%d" -disable hppa_tlb_fill_success(void *env, uint64_t addr, uint64_t phys, int= size, int type, int mmu_idx) "env=3D%p addr=3D0x%" PRIx64 " phys=3D0x%" PR= Ix64 " size=3D%d type=3D%d mmu_idx=3D%d" -disable hppa_tlb_itlba(void *env, void *ent, uint64_t va_b, uint64_t va_e,= uint64_t pa) "env=3D%p ent=3D%p va_b=3D0x%" PRIx64 " va_e=3D0x%" PRIx64 " = pa=3D0x%" PRIx64 -disable hppa_tlb_itlbp(void *env, void *ent, int access_id, int u, int pl2= , int pl1, int type, int b, int d, int t) "env=3D%p ent=3D%p access_id=3D0x= %x u=3D%d pl2=3D%d pl1=3D%d type=3D%d b=3D%d d=3D%d t=3D%d" -disable hppa_tlb_ptlb(void *env) "env=3D%p" -disable hppa_tlb_ptlb_local(void *env) "env=3D%p" -disable hppa_tlb_ptlbe(void *env) "env=3D%p" -disable hppa_tlb_lpa_success(void *env, uint64_t addr, uint64_t phys) "env= =3D%p addr=3D0x%" PRIx64 " phys=3D0x%" PRIx64 "" -disable hppa_tlb_lpa_failed(void *env, uint64_t addr) "env=3D%p addr=3D0x%= " PRIx64 "" +hppa_tlb_flush_ent(void *env, void *ent, uint64_t va_b, uint64_t va_e, uin= t64_t pa) "env=3D%p ent=3D%p va_b=3D0x%" PRIx64 " va_e=3D0x%" PRIx64 " pa= =3D0x%" PRIx64 +hppa_tlb_find_entry(void *env, void *ent, int valid, uint64_t va_b, uint64= _t va_e, uint64_t pa) "env=3D%p ent=3D%p valid=3D%d va_b=3D0x%" PRIx64 " va= _e=3D0x%" PRIx64 " pa=3D0x%" PRIx64 +hppa_tlb_find_entry_not_found(void *env, uint64_t addr) "env=3D%p addr=3D0= x%" PRIx64 +hppa_tlb_get_physical_address(void *env, int ret, int prot, uint64_t addr,= uint64_t phys) "env=3D%p ret=3D%d prot=3D%d addr=3D0x%" PRIx64 " phys=3D0x= %" PRIx64 "" +hppa_tlb_fill_excp(void *env, uint64_t addr, int size, int type, int mmu_i= dx) "env=3D%p addr=3D0x%" PRIx64 " size=3D%d type=3D%d mmu_idx=3D%d" +hppa_tlb_fill_success(void *env, uint64_t addr, uint64_t phys, int size, i= nt type, int mmu_idx) "env=3D%p addr=3D0x%" PRIx64 " phys=3D0x%" PRIx64 " s= ize=3D%d type=3D%d mmu_idx=3D%d" +hppa_tlb_itlba(void *env, void *ent, uint64_t va_b, uint64_t va_e, uint64_= t pa) "env=3D%p ent=3D%p va_b=3D0x%" PRIx64 " va_e=3D0x%" PRIx64 " pa=3D0x%= " PRIx64 +hppa_tlb_itlbp(void *env, void *ent, int access_id, int u, int pl2, int pl= 1, int type, int b, int d, int t) "env=3D%p ent=3D%p access_id=3D0x%x u=3D%= d pl2=3D%d pl1=3D%d type=3D%d b=3D%d d=3D%d t=3D%d" +hppa_tlb_ptlb(void *env) "env=3D%p" +hppa_tlb_ptlb_local(void *env) "env=3D%p" +hppa_tlb_ptlbe(void *env) "env=3D%p" +hppa_tlb_lpa_success(void *env, uint64_t addr, uint64_t phys) "env=3D%p ad= dr=3D0x%" PRIx64 " phys=3D0x%" PRIx64 "" +hppa_tlb_lpa_failed(void *env, uint64_t addr) "env=3D%p addr=3D0x%" PRIx64= "" =20 # op_helper.c -disable hppa_tlb_probe(uint64_t addr, int level, int want) "addr=3D0x%" PR= Ix64 " level=3D%d want=3D%d" +hppa_tlb_probe(uint64_t addr, int level, int want) "addr=3D0x%" PRIx64 " l= evel=3D%d want=3D%d" --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823732; cv=none; d=zohomail.com; s=zohoarc; b=VpXyaBlK86Uk64geRwU4dE5zWVSi6O2QQne6ayrk27+HWuKGOqwj5NFGtNBqd+RwHOYw2vZFPUSdV7YWRxE+D8ERoqHeplnY3YaBrBUWv+Zd+jNiy8RLGbILvaTREhFrSfU56BV5db+BfbesIXGnzNejDLth7eGx5OMQlPef9Y8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823732; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=z+pc48rjFwC1YPMnBCEt4xr6ekBLWcGs39MtawFeyiM=; b=LFUNYkqdQF0zahB9ipdg+Nxy+V4CKo4o7mPgkqorboAZQD0ojpSbWYY4wjp+IQLLCjqvH+SRgEPSwTc8uGVD6Atg0Vettyaux7Sr+tHrIcvzCbo7gQn+cjcirsttBebBcgi6F9h8aH3/dB2swySeN8eyHuiLqCJU1RlLgsl06ws= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1793823732907183.03055184043012; Wed, 4 Nov 2026 12:22:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRi-0007Df-Ez; Wed, 04 Nov 2026 15:18:58 -0500 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 1xOhRa-00074y-Sj for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xOhRX-0006CI-Pd for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:50 -0500 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-280-dGA9SqUMNreAxbtGZFRaGg-1; Wed, 04 Nov 2026 15:18:43 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 C7AFD195607B; Wed, 4 Nov 2026 20:18:41 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E6AE918004FC; Wed, 4 Nov 2026 20:18:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823527; 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=z+pc48rjFwC1YPMnBCEt4xr6ekBLWcGs39MtawFeyiM=; b=LPX3MDt8TFxOUdrNw2qI1RSReLbL1/GIMvdL+dgKNlGQjHqsrhK1KsRBulWFuU+ItIr4Ks CgxlGFbtCdOCxgNOaEVFIUEbng8d+Ad6CSpcewQj0UvDMPAneHm/MnNjxwEh2/2rPOqp20 EolvoSkd6iw3SiyNBVi+9Ra3E+JpJWI= X-MC-Unique: dGA9SqUMNreAxbtGZFRaGg-1 X-Mimecast-MFC-AGG-ID: dGA9SqUMNreAxbtGZFRaGg_1793823521 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 23/25] trace: stop tracking static disabled state Date: Wed, 4 Nov 2026 15:17:59 -0500 Message-ID: <20261104201802.11556-24-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823733217158500 From: Daniel P. Berrang=C3=A9 The TraceEvent struct contains a "bool sstate" field which track whether a trace event was disabled statically. i.e. at build time via the "disable" property annotation in trace-events. The only runtime use of this field is to let "trace-event-get-state" report that an event is "unavailable" instead of reporting an error for an unknown trace event. Trace events are not ABI so their names can change and the event can come and go at any time. Thus there is little utility in reporting the existence of a disabled event that cannot ever be used at runtime. Removing the "bool sstate" field from TraceEvent saves 8 bytes of space in the struct, adding up to approx 64 KB across all current events. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-24-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- qapi/trace.json | 5 ++-- tests/tracetool/all.h | 14 +++++------ tests/tracetool/dtrace.h | 2 -- tests/tracetool/ftrace.h | 6 ++--- tests/tracetool/log.h | 6 ++--- tests/tracetool/nop.h | 2 -- tests/tracetool/simple.h | 2 -- tests/tracetool/syslog.h | 6 ++--- tests/tracetool/ust.h | 2 -- trace/control-internal.h | 6 ----- trace/control.h | 27 +++----------------- trace/event-internal.h | 2 -- stubs/trace-control.c | 1 - tests/tracetool/all.c | 2 -- tests/tracetool/dtrace.c | 2 -- tests/tracetool/ftrace.c | 2 -- tests/tracetool/log.c | 2 -- tests/tracetool/simple.c | 2 -- tests/tracetool/syslog.c | 2 -- tests/tracetool/ust.c | 2 -- trace/control-target.c | 2 -- trace/control.c | 9 ------- trace/qmp.c | 47 ++++++++++------------------------- scripts/tracetool/format/c.py | 2 -- scripts/tracetool/format/h.py | 8 ------ 25 files changed, 31 insertions(+), 132 deletions(-) diff --git a/qapi/trace.json b/qapi/trace.json index 29c76256055..8533e378977 100644 --- a/qapi/trace.json +++ b/qapi/trace.json @@ -16,8 +16,6 @@ # @TraceEventState: # State of a tracing event. # -# @unavailable: The event is statically disabled. -# # @disabled: The event is dynamically disabled. # # @enabled: The event is dynamically enabled. @@ -25,7 +23,7 @@ # Since: 2.2 ## { 'enum': 'TraceEventState', - 'data': ['unavailable', 'disabled', 'enabled'] } + 'data': ['disabled', 'enabled'] } =20 ## # @TraceEventInfo: @@ -69,6 +67,7 @@ # @enable: Whether to enable tracing. # # @ignore-unavailable: Do not match unavailable events with @name. +# Deprecated: since 11.2 # # Since: 2.2 # diff --git a/tests/tracetool/all.h b/tests/tracetool/all.h index 0ae2598eb1d..01971827e4b 100644 --- a/tests/tracetool/all.h +++ b/tests/tracetool/all.h @@ -10,8 +10,6 @@ extern TraceEvent _TRACE_TEST_BLAH_EVENT; extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; extern uint8_t _TRACE_TEST_BLAH_DSTATE; extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; -#define TRACE_TEST_BLAH_ENABLED 1 -#define TRACE_TEST_WIBBLE_ENABLED 1 #ifndef SDT_USE_VARIADIC #define SDT_USE_VARIADIC 1 #endif @@ -57,17 +55,17 @@ static inline void trace_test_blah(void *context, const= char *filename) qemu_loglevel_mask(LOG_TRACE)) { #line 4 "trace-events" qemu_log("test_blah " "Blah context=3D%p filename=3D%s" "\n", = context, filename); -#line 61 "all.h" +#line 59 "all.h" } tracepoint(qemu, test_blah, context, filename); if (trace_event_get_state(TRACE_TEST_BLAH)) { #line 4 "trace-events" ftrace_write("test_blah " "Blah context=3D%p filename=3D%s" "\n" ,= context, filename); -#line 67 "all.h" +#line 65 "all.h" _simple_trace_test_blah(context, filename); #line 4 "trace-events" syslog(LOG_INFO, "test_blah " "Blah context=3D%p filename=3D%s" , = context, filename); -#line 71 "all.h" +#line 69 "all.h" } } =20 @@ -86,17 +84,17 @@ static inline void trace_test_wibble(void *context, int= value) qemu_loglevel_mask(LOG_TRACE)) { #line 5 "trace-events" qemu_log("test_wibble " "Wibble context=3D%p value=3D%d" "\n",= context, value); -#line 90 "all.h" +#line 88 "all.h" } tracepoint(qemu, test_wibble, context, value); if (trace_event_get_state(TRACE_TEST_WIBBLE)) { #line 5 "trace-events" ftrace_write("test_wibble " "Wibble context=3D%p value=3D%d" "\n" = , context, value); -#line 96 "all.h" +#line 94 "all.h" _simple_trace_test_wibble(context, value); #line 5 "trace-events" syslog(LOG_INFO, "test_wibble " "Wibble context=3D%p value=3D%d" ,= context, value); -#line 100 "all.h" +#line 98 "all.h" } } #endif /* TRACE_TESTSUITE_GENERATED_TRACERS_H */ diff --git a/tests/tracetool/dtrace.h b/tests/tracetool/dtrace.h index 0b5b47089e8..b9283851eb0 100644 --- a/tests/tracetool/dtrace.h +++ b/tests/tracetool/dtrace.h @@ -10,8 +10,6 @@ extern TraceEvent _TRACE_TEST_BLAH_EVENT; extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; extern uint8_t _TRACE_TEST_BLAH_DSTATE; extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; -#define TRACE_TEST_BLAH_ENABLED 1 -#define TRACE_TEST_WIBBLE_ENABLED 1 #ifndef SDT_USE_VARIADIC #define SDT_USE_VARIADIC 1 #endif diff --git a/tests/tracetool/ftrace.h b/tests/tracetool/ftrace.h index b34eef17d10..4eba6b4d599 100644 --- a/tests/tracetool/ftrace.h +++ b/tests/tracetool/ftrace.h @@ -10,8 +10,6 @@ extern TraceEvent _TRACE_TEST_BLAH_EVENT; extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; extern uint8_t _TRACE_TEST_BLAH_DSTATE; extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; -#define TRACE_TEST_BLAH_ENABLED 1 -#define TRACE_TEST_WIBBLE_ENABLED 1 #include "trace/ftrace.h" =20 =20 @@ -24,7 +22,7 @@ static inline void trace_test_blah(void *context, const c= har *filename) if (trace_event_get_state(TRACE_TEST_BLAH)) { #line 4 "trace-events" ftrace_write("test_blah " "Blah context=3D%p filename=3D%s" "\n" ,= context, filename); -#line 28 "ftrace.h" +#line 26 "ftrace.h" } } =20 @@ -37,7 +35,7 @@ static inline void trace_test_wibble(void *context, int v= alue) if (trace_event_get_state(TRACE_TEST_WIBBLE)) { #line 5 "trace-events" ftrace_write("test_wibble " "Wibble context=3D%p value=3D%d" "\n" = , context, value); -#line 41 "ftrace.h" +#line 39 "ftrace.h" } } #endif /* TRACE_TESTSUITE_GENERATED_TRACERS_H */ diff --git a/tests/tracetool/log.h b/tests/tracetool/log.h index 9957a854c00..9afbe721a47 100644 --- a/tests/tracetool/log.h +++ b/tests/tracetool/log.h @@ -10,8 +10,6 @@ extern TraceEvent _TRACE_TEST_BLAH_EVENT; extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; extern uint8_t _TRACE_TEST_BLAH_DSTATE; extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; -#define TRACE_TEST_BLAH_ENABLED 1 -#define TRACE_TEST_WIBBLE_ENABLED 1 #include "qemu/log-for-trace.h" =20 =20 @@ -26,7 +24,7 @@ static inline void trace_test_blah(void *context, const c= har *filename) qemu_loglevel_mask(LOG_TRACE)) { #line 4 "trace-events" qemu_log("test_blah " "Blah context=3D%p filename=3D%s" "\n", = context, filename); -#line 30 "log.h" +#line 28 "log.h" } } =20 @@ -41,7 +39,7 @@ static inline void trace_test_wibble(void *context, int v= alue) qemu_loglevel_mask(LOG_TRACE)) { #line 5 "trace-events" qemu_log("test_wibble " "Wibble context=3D%p value=3D%d" "\n",= context, value); -#line 45 "log.h" +#line 43 "log.h" } } #endif /* TRACE_TESTSUITE_GENERATED_TRACERS_H */ diff --git a/tests/tracetool/nop.h b/tests/tracetool/nop.h index 64b6b005684..00771577943 100644 --- a/tests/tracetool/nop.h +++ b/tests/tracetool/nop.h @@ -8,8 +8,6 @@ =20 #define _TRACE_TEST_BLAH_DSTATE 0 #define _TRACE_TEST_WIBBLE_DSTATE 0 -#define TRACE_TEST_BLAH_ENABLED 1 -#define TRACE_TEST_WIBBLE_ENABLED 1 =20 #define TRACE_TEST_BLAH_BACKEND_DSTATE() ( \ false) diff --git a/tests/tracetool/simple.h b/tests/tracetool/simple.h index 735cb21d911..9b066364b0a 100644 --- a/tests/tracetool/simple.h +++ b/tests/tracetool/simple.h @@ -10,8 +10,6 @@ extern TraceEvent _TRACE_TEST_BLAH_EVENT; extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; extern uint8_t _TRACE_TEST_BLAH_DSTATE; extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; -#define TRACE_TEST_BLAH_ENABLED 1 -#define TRACE_TEST_WIBBLE_ENABLED 1 void _simple_trace_test_blah(void *context, const char *filename); void _simple_trace_test_wibble(void *context, int value); =20 diff --git a/tests/tracetool/syslog.h b/tests/tracetool/syslog.h index 4203b8b37dc..6a9304489f6 100644 --- a/tests/tracetool/syslog.h +++ b/tests/tracetool/syslog.h @@ -10,8 +10,6 @@ extern TraceEvent _TRACE_TEST_BLAH_EVENT; extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; extern uint8_t _TRACE_TEST_BLAH_DSTATE; extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; -#define TRACE_TEST_BLAH_ENABLED 1 -#define TRACE_TEST_WIBBLE_ENABLED 1 #include =20 =20 @@ -24,7 +22,7 @@ static inline void trace_test_blah(void *context, const c= har *filename) if (trace_event_get_state(TRACE_TEST_BLAH)) { #line 4 "trace-events" syslog(LOG_INFO, "test_blah " "Blah context=3D%p filename=3D%s" , = context, filename); -#line 28 "syslog.h" +#line 26 "syslog.h" } } =20 @@ -37,7 +35,7 @@ static inline void trace_test_wibble(void *context, int v= alue) if (trace_event_get_state(TRACE_TEST_WIBBLE)) { #line 5 "trace-events" syslog(LOG_INFO, "test_wibble " "Wibble context=3D%p value=3D%d" ,= context, value); -#line 41 "syslog.h" +#line 39 "syslog.h" } } #endif /* TRACE_TESTSUITE_GENERATED_TRACERS_H */ diff --git a/tests/tracetool/ust.h b/tests/tracetool/ust.h index 079b2c74491..c6c5d6d7c1c 100644 --- a/tests/tracetool/ust.h +++ b/tests/tracetool/ust.h @@ -10,8 +10,6 @@ extern TraceEvent _TRACE_TEST_BLAH_EVENT; extern TraceEvent _TRACE_TEST_WIBBLE_EVENT; extern uint8_t _TRACE_TEST_BLAH_DSTATE; extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; -#define TRACE_TEST_BLAH_ENABLED 1 -#define TRACE_TEST_WIBBLE_ENABLED 1 #include #include "trace-ust-testsuite.h" =20 diff --git a/trace/control-internal.h b/trace/control-internal.h index f626b047264..9a95e6714bb 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -33,12 +33,6 @@ static inline const char * trace_event_get_name(TraceEve= nt *ev) return ev->name; } =20 -static inline bool trace_event_get_state_static(TraceEvent *ev) -{ - assert(ev !=3D NULL); - return ev->sstate; -} - /* it's on fast path, avoid consistency checks (asserts) */ #define trace_event_get_state_dynamic_by_id(id) \ (unlikely(trace_events_enabled_count) && _ ## id ## _DSTATE) diff --git a/trace/control.h b/trace/control.h index e77c07a8e68..71f254728d4 100644 --- a/trace/control.h +++ b/trace/control.h @@ -102,39 +102,21 @@ static const char * trace_event_get_name(TraceEvent *= ev); * @id: Event identifier name. * * Get the tracing state of an event, both static and the QEMU dynamic sta= te. - * - * If the event has the disabled property, the check will have no performa= nce - * impact. */ #define trace_event_get_state(id) \ - ((id ##_ENABLED) && trace_event_get_state_dynamic_by_id(id)) + (trace_event_get_state_dynamic_by_id(id)) =20 /** * trace_event_get_state_backends: * @id: Event identifier name. * - * Get the tracing state of an event, both static and dynamic state from a= ll + * Get the tracing state of an event from all * compiled-in backends. * - * If the event has the disabled property, the check will have no performa= nce - * impact. - * - * Returns: true if at least one backend has the event enabled and the eve= nt - * does not have the disabled property. + * Returns: true if at least one backend has the event enabled */ #define trace_event_get_state_backends(id) \ - ((id ##_ENABLED) && id ##_BACKEND_DSTATE()) - -/** - * trace_event_get_state_static: - * @id: Event identifier. - * - * Get the static tracing state of an event. - * - * Use the define 'TRACE_${EVENT_NAME}_ENABLED' for compile-time checks (i= t will - * be set to 1 or 0 according to the presence of the disabled property). - */ -static bool trace_event_get_state_static(TraceEvent *ev); + (id ##_BACKEND_DSTATE()) =20 /** * trace_event_get_state_dynamic: @@ -148,7 +130,6 @@ static bool trace_event_get_state_dynamic(TraceEvent *e= v); * * Set the dynamic tracing state of an event. * - * Pre-condition: trace_event_get_state_static(ev) =3D=3D true */ void trace_event_set_state_dynamic(TraceEvent *ev, bool state); =20 diff --git a/trace/event-internal.h b/trace/event-internal.h index ad1578aa2c5..40f06691063 100644 --- a/trace/event-internal.h +++ b/trace/event-internal.h @@ -14,7 +14,6 @@ * TraceEvent: * @id: Unique event identifier. * @name: Event name. - * @sstate: Static tracing state. * @dstate: Dynamic tracing state * * Opaque generic description of a tracing event. @@ -24,7 +23,6 @@ typedef struct TraceEvent { uint32_t id; #endif const char * name; - const bool sstate; uint8_t *dstate; } TraceEvent; =20 diff --git a/stubs/trace-control.c b/stubs/trace-control.c index 3f196835db0..6016307ed8b 100644 --- a/stubs/trace-control.c +++ b/stubs/trace-control.c @@ -14,7 +14,6 @@ void trace_event_set_state_dynamic(TraceEvent *ev, bool state) { bool state_pre; - assert(trace_event_get_state_static(ev)); =20 /* * We ignore the "vcpu" property here, since there's no target code. T= hen diff --git a/tests/tracetool/all.c b/tests/tracetool/all.c index 3b8d4d32d17..670f9f06e85 100644 --- a/tests/tracetool/all.c +++ b/tests/tracetool/all.c @@ -12,7 +12,6 @@ TraceEvent _TRACE_TEST_BLAH_EVENT =3D { .id =3D 0, #endif .name =3D "test_blah", - .sstate =3D TRACE_TEST_BLAH_ENABLED, .dstate =3D &_TRACE_TEST_BLAH_DSTATE }; TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { @@ -20,7 +19,6 @@ TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { .id =3D 0, #endif .name =3D "test_wibble", - .sstate =3D TRACE_TEST_WIBBLE_ENABLED, .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE }; TraceEvent *testsuite_trace_events[] =3D { diff --git a/tests/tracetool/dtrace.c b/tests/tracetool/dtrace.c index f83d06252ea..d51ba85503a 100644 --- a/tests/tracetool/dtrace.c +++ b/tests/tracetool/dtrace.c @@ -12,7 +12,6 @@ TraceEvent _TRACE_TEST_BLAH_EVENT =3D { .id =3D 0, #endif .name =3D "test_blah", - .sstate =3D TRACE_TEST_BLAH_ENABLED, .dstate =3D &_TRACE_TEST_BLAH_DSTATE }; TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { @@ -20,7 +19,6 @@ TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { .id =3D 0, #endif .name =3D "test_wibble", - .sstate =3D TRACE_TEST_WIBBLE_ENABLED, .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE }; TraceEvent *testsuite_trace_events[] =3D { diff --git a/tests/tracetool/ftrace.c b/tests/tracetool/ftrace.c index f83d06252ea..d51ba85503a 100644 --- a/tests/tracetool/ftrace.c +++ b/tests/tracetool/ftrace.c @@ -12,7 +12,6 @@ TraceEvent _TRACE_TEST_BLAH_EVENT =3D { .id =3D 0, #endif .name =3D "test_blah", - .sstate =3D TRACE_TEST_BLAH_ENABLED, .dstate =3D &_TRACE_TEST_BLAH_DSTATE }; TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { @@ -20,7 +19,6 @@ TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { .id =3D 0, #endif .name =3D "test_wibble", - .sstate =3D TRACE_TEST_WIBBLE_ENABLED, .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE }; TraceEvent *testsuite_trace_events[] =3D { diff --git a/tests/tracetool/log.c b/tests/tracetool/log.c index f83d06252ea..d51ba85503a 100644 --- a/tests/tracetool/log.c +++ b/tests/tracetool/log.c @@ -12,7 +12,6 @@ TraceEvent _TRACE_TEST_BLAH_EVENT =3D { .id =3D 0, #endif .name =3D "test_blah", - .sstate =3D TRACE_TEST_BLAH_ENABLED, .dstate =3D &_TRACE_TEST_BLAH_DSTATE }; TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { @@ -20,7 +19,6 @@ TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { .id =3D 0, #endif .name =3D "test_wibble", - .sstate =3D TRACE_TEST_WIBBLE_ENABLED, .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE }; TraceEvent *testsuite_trace_events[] =3D { diff --git a/tests/tracetool/simple.c b/tests/tracetool/simple.c index 3b8d4d32d17..670f9f06e85 100644 --- a/tests/tracetool/simple.c +++ b/tests/tracetool/simple.c @@ -12,7 +12,6 @@ TraceEvent _TRACE_TEST_BLAH_EVENT =3D { .id =3D 0, #endif .name =3D "test_blah", - .sstate =3D TRACE_TEST_BLAH_ENABLED, .dstate =3D &_TRACE_TEST_BLAH_DSTATE }; TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { @@ -20,7 +19,6 @@ TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { .id =3D 0, #endif .name =3D "test_wibble", - .sstate =3D TRACE_TEST_WIBBLE_ENABLED, .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE }; TraceEvent *testsuite_trace_events[] =3D { diff --git a/tests/tracetool/syslog.c b/tests/tracetool/syslog.c index f83d06252ea..d51ba85503a 100644 --- a/tests/tracetool/syslog.c +++ b/tests/tracetool/syslog.c @@ -12,7 +12,6 @@ TraceEvent _TRACE_TEST_BLAH_EVENT =3D { .id =3D 0, #endif .name =3D "test_blah", - .sstate =3D TRACE_TEST_BLAH_ENABLED, .dstate =3D &_TRACE_TEST_BLAH_DSTATE }; TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { @@ -20,7 +19,6 @@ TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { .id =3D 0, #endif .name =3D "test_wibble", - .sstate =3D TRACE_TEST_WIBBLE_ENABLED, .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE }; TraceEvent *testsuite_trace_events[] =3D { diff --git a/tests/tracetool/ust.c b/tests/tracetool/ust.c index f83d06252ea..d51ba85503a 100644 --- a/tests/tracetool/ust.c +++ b/tests/tracetool/ust.c @@ -12,7 +12,6 @@ TraceEvent _TRACE_TEST_BLAH_EVENT =3D { .id =3D 0, #endif .name =3D "test_blah", - .sstate =3D TRACE_TEST_BLAH_ENABLED, .dstate =3D &_TRACE_TEST_BLAH_DSTATE }; TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { @@ -20,7 +19,6 @@ TraceEvent _TRACE_TEST_WIBBLE_EVENT =3D { .id =3D 0, #endif .name =3D "test_wibble", - .sstate =3D TRACE_TEST_WIBBLE_ENABLED, .dstate =3D &_TRACE_TEST_WIBBLE_DSTATE }; TraceEvent *testsuite_trace_events[] =3D { diff --git a/trace/control-target.c b/trace/control-target.c index 87b0f5037df..348125a5822 100644 --- a/trace/control-target.c +++ b/trace/control-target.c @@ -12,8 +12,6 @@ =20 void trace_event_set_state_dynamic(TraceEvent *ev, bool state) { - assert(trace_event_get_state_static(ev)); - bool state_pre =3D *ev->dstate; if (state_pre !=3D state) { if (state) { diff --git a/trace/control.c b/trace/control.c index 947b220056a..d414b1a9072 100644 --- a/trace/control.c +++ b/trace/control.c @@ -167,15 +167,6 @@ static void do_trace_enable_events(const char *line_bu= f) =20 trace_event_iter_init_pattern(&iter, line_ptr); while ((ev =3D trace_event_iter_next(&iter)) !=3D NULL) { - if (!trace_event_get_state_static(ev)) { - if (!is_pattern) { - warn_report("trace event '%s' is not traceable", - line_ptr); - return; - } - continue; - } - /* start tracing */ trace_event_set_state_dynamic(ev, enable); if (!is_pattern) { diff --git a/trace/qmp.c b/trace/qmp.c index 074a27b204f..331496a1471 100644 --- a/trace/qmp.c +++ b/trace/qmp.c @@ -11,9 +11,10 @@ #include "qapi/error.h" #include "qapi/qapi-commands-trace.h" #include "control.h" +#include "qemu/error-report.h" =20 =20 -static bool check_events(bool ignore_unavailable, bool is_pattern, +static bool check_events(bool is_pattern, const char *name, Error **errp) { if (!is_pattern) { @@ -24,27 +25,8 @@ static bool check_events(bool ignore_unavailable, bool i= s_pattern, error_setg(errp, "unknown event \"%s\"", name); return false; } - - /* error for unavailable event */ - if (!ignore_unavailable && !trace_event_get_state_static(ev)) { - error_setg(errp, "event \"%s\" is disabled", name); - return false; - } - - return true; - } else { - /* error for unavailable events */ - TraceEventIter iter; - TraceEvent *ev; - trace_event_iter_init_pattern(&iter, name); - while ((ev =3D trace_event_iter_next(&iter)) !=3D NULL) { - if (!ignore_unavailable && !trace_event_get_state_static(ev)) { - error_setg(errp, "event \"%s\" is disabled", trace_event_g= et_name(ev)); - return false; - } - } - return true; } + return true; } =20 TraceEventInfoList *qmp_trace_event_get_state(const char *name, @@ -56,7 +38,7 @@ TraceEventInfoList *qmp_trace_event_get_state(const char = *name, bool is_pattern =3D trace_event_is_pattern(name); =20 /* Check events */ - if (!check_events(true, is_pattern, name, errp)) { + if (!check_events(is_pattern, name, errp)) { return NULL; } =20 @@ -68,14 +50,10 @@ TraceEventInfoList *qmp_trace_event_get_state(const cha= r *name, value =3D g_new(TraceEventInfo, 1); value->name =3D g_strdup(trace_event_get_name(ev)); =20 - if (!trace_event_get_state_static(ev)) { - value->state =3D TRACE_EVENT_STATE_UNAVAILABLE; + if (trace_event_get_state_dynamic(ev)) { + value->state =3D TRACE_EVENT_STATE_ENABLED; } else { - if (trace_event_get_state_dynamic(ev)) { - value->state =3D TRACE_EVENT_STATE_ENABLED; - } else { - value->state =3D TRACE_EVENT_STATE_DISABLED; - } + value->state =3D TRACE_EVENT_STATE_DISABLED; } QAPI_LIST_PREPEND(events, value); } @@ -91,18 +69,19 @@ void qmp_trace_event_set_state(const char *name, bool e= nable, TraceEvent *ev; bool is_pattern =3D trace_event_is_pattern(name); =20 + if (has_ignore_unavailable && ignore_unavailable) { + warn_report_once("the 'ignore-unavailable' property is deprecated " + "and has no effect"); + } + /* Check events */ - if (!check_events(has_ignore_unavailable && ignore_unavailable, - is_pattern, name, errp)) { + if (!check_events(is_pattern, name, errp)) { return; } =20 /* Apply changes (all errors checked above) */ trace_event_iter_init_pattern(&iter, name); while ((ev =3D trace_event_iter_next(&iter)) !=3D NULL) { - if (!trace_event_get_state_static(ev)) { - continue; - } trace_event_set_state_dynamic(ev, enable); } } diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py index 5f6669c917c..9f06894623e 100644 --- a/scripts/tracetool/format/c.py +++ b/scripts/tracetool/format/c.py @@ -39,12 +39,10 @@ def generate(events, backend, group): ' .id =3D 0,', '#endif', ' .name =3D \"%(name)s\",', - ' .sstate =3D %(sstate)s,', ' .dstate =3D &%(dstate)s', '};', event =3D e.api(e.QEMU_EVENT), name =3D e.name, - sstate =3D "TRACE_%s_ENABLED" % e.name.upper(), dstate =3D e.api(e.QEMU_DSTATE)) =20 out('TraceEvent *%(group)s_trace_events[] =3D {', diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index 5ad3a419f82..544bbc0ba93 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -38,14 +38,6 @@ def generate(events, backend, group): for e in events: out('#define %s 0' % e.api(e.QEMU_DSTATE)) =20 - # static state - for e in events: - if 'disable' in e.properties: - enabled =3D 0 - else: - enabled =3D 1 - out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled)) - backend.generate_begin(events, group) =20 for e in events: --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823742; cv=none; d=zohomail.com; s=zohoarc; b=bU2VjabCOlENt+8VhBuUYHpG+dxOq+EGL6swwE9k8J086LbIPW3B8YN0Ff7H1A/0Hxzqs3AfDMS0UPZLJVfHuvH+RLhOMuZBNeTCuPg5UuZ1K1SKYZ6mhlnrHSTPQv6QPLVvHF7rv6Ej0eDAaGao7vT972me9/tNx6mYuzF4kA4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823742; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iBUiZ9J/MXAwZUcV5uBewFxgpdyM35rzQHUpr8XDSZ8=; b=QT3rHw/sKm4PWOug42oESA/LkwPOcvEXlO8odRgX1JCcGE4cDyUJmd5fJxhMBXfB4dWusB40+Bd3Tal5rwbWwMbSdoz+K6CB9Mt2jX9pzAvM95gOmksR9nUhySSdX+15ZVMtxI9y9ow9fCqGiSl/x2vN3WhXJyX4uCeg46IdlHA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1793823742824522.1750535993245; Wed, 4 Nov 2026 12:22:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRj-0007ES-Bu; Wed, 04 Nov 2026 15:18:59 -0500 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 1xOhRb-00075s-C6 for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:51 -0500 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 1xOhRY-0006Cq-SG for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:51 -0500 Received: from mx-prod-mc-01.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-333-U_0NOw0JMTG5B1fJWdDKJg-1; Wed, 04 Nov 2026 15:18:44 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 087B91955EA9; Wed, 4 Nov 2026 20:18:43 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AC81218004FC; Wed, 4 Nov 2026 20:18:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823528; 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=iBUiZ9J/MXAwZUcV5uBewFxgpdyM35rzQHUpr8XDSZ8=; b=Mqxe8DEJJIvYJ8BSWCx9d5NKPudxY3VDddMhm5yGt5jeGZiY1r1gRGVR4hAkOllMTvESS4 DRRcOWEqXFNasTJp+pbvE4vm/rSiaf3wXPtrrGy9gcdmnJGHoSEyXcNiRlnTgIRx4QLUvp gA4gZITuN5MIYRINCUOFdy/tdEI/P7E= X-MC-Unique: U_0NOw0JMTG5B1fJWdDKJg-1 X-Mimecast-MFC-AGG-ID: U_0NOw0JMTG5B1fJWdDKJg_1793823523 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 24/25] trace: remove parsing of "disable" event property Date: Wed, 4 Nov 2026 15:18:00 -0500 Message-ID: <20261104201802.11556-25-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1793823743426158500 From: Daniel P. Berrang=C3=A9 Finish the removal of the "disable" event property by removing code that parses properties and the backend code generators. This "fixes" a bug in the UST backends which looked for a property called "disabled" instead of "disable". Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-25-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- docs/devel/tracing.rst | 27 +++--------------- scripts/tracetool/__init__.py | 27 ++++-------------- scripts/tracetool/backend/dtrace.py | 2 -- scripts/tracetool/format/c.py | 9 ++---- scripts/tracetool/format/d.py | 3 -- scripts/tracetool/format/h.py | 30 +++++++++----------- scripts/tracetool/format/log_stap.py | 3 -- scripts/tracetool/format/rs.py | 26 ++++++++--------- scripts/tracetool/format/simpletrace_stap.py | 3 -- scripts/tracetool/format/stap.py | 3 -- scripts/tracetool/format/ust_events_c.py | 3 -- scripts/tracetool/format/ust_events_h.py | 3 -- 12 files changed, 39 insertions(+), 100 deletions(-) diff --git a/docs/devel/tracing.rst b/docs/devel/tracing.rst index f4557ee20e4..4bc344f0331 100644 --- a/docs/devel/tracing.rst +++ b/docs/devel/tracing.rst @@ -230,9 +230,6 @@ The "nop" backend generates empty trace event functions= so that the compiler can optimize out trace events completely. This imposes no performance penalty. =20 -Note that regardless of the selected trace backend, events with the "disab= le" -property will be generated with the "nop" backend. - Log --- =20 @@ -366,30 +363,14 @@ To facilitate simple usage of systemtap where there m= erely needs to be printf logging of certain probes, a helper script "qemu-trace-stap" is provided. Consult its manual page for guidance on its usage. =20 -Trace event properties +Trace event conditions =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -Each event in the "trace-events-all" file can be prefixed with a space-sep= arated -list of zero or more of the following event properties. - -"disable" ---------- - -If a specific trace event is going to be invoked a huge number of times, t= his -might have a noticeable performance impact even when the event is -programmatically disabled. - -In this case you should declare such event with the "disable" property. Th= is -will effectively disable the event at compile time (by using the "nop" bac= kend), -thus having no performance impact at all on regular builds (i.e., unless y= ou -edit the "trace-events-all" file). - -In addition, there might be cases where relatively complex computations mu= st be +There might be cases where relatively complex computations must be performed to generate values that are only used as arguments for a trace function. In these cases you can use 'trace_event_get_state_backends()' to -guard such computations, so they are skipped if the event has been either -compile-time disabled or run-time disabled. If the event is compile-time -disabled, this check will have no performance impact. +guard such computations, so they are skipped if the event is not currently +enabled: =20 :: =20 diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 6ed7cdd6ce4..bdbb06b5205 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -362,8 +362,6 @@ class Event(object): The event name. fmt : str The event format string. - properties : set(str) - Properties of the event. args : Arguments The event arguments. lineno : int @@ -373,23 +371,18 @@ class Event(object): =20 """ =20 - _CRE =3D re.compile(r"((?P[\w\s]+)\s+)?" - r"(?P\w+)" + _CRE =3D re.compile(r"(?P\w+)" r"\((?P[^)]*)\)" r"\s*" r"(?P\".+)?" r"\s*") =20 - _VALID_PROPS =3D set(["disable"]) - - def __init__(self, name, props, fmt, args, lineno, filename): + def __init__(self, name, fmt, args, lineno, filename): """ Parameters ---------- name : string Event name. - props : list of str - Property names. fmt : str Event printing format string. args : Arguments @@ -401,7 +394,6 @@ def __init__(self, name, props, fmt, args, lineno, file= name): =20 """ self.name =3D name - self.properties =3D props self.fmt =3D fmt self.args =3D args self.lineno =3D int(lineno) @@ -411,11 +403,6 @@ def __init__(self, name, props, fmt, args, lineno, fil= ename): raise ValueError("Event '%s' has more than maximum permitted " "argument count" % name) =20 - unknown_props =3D set(self.properties) - self._VALID_PROPS - if len(unknown_props) > 0: - raise ValueError("Unknown properties: %s" - % ", ".join(unknown_props)) - =20 @staticmethod def build(line_str, lineno, filename): @@ -435,7 +422,6 @@ def build(line_str, lineno, filename): groups =3D m.groupdict('') =20 name =3D groups["name"] - props =3D groups["props"].split() fmt =3D groups["fmt"] if fmt.find("%m") !=3D -1: raise ValueError("Event format '%m' is forbidden, pass the err= or " @@ -448,14 +434,13 @@ def build(line_str, lineno, filename): =20 args =3D Arguments.build(groups["args"]) =20 - return Event(name, props, fmt, args, lineno, posix_relpath(filenam= e)) + return Event(name, fmt, args, lineno, posix_relpath(filename)) =20 def __repr__(self): """Evaluable string representation for this object.""" - return "Event('%s %s(%s) %s')" % (" ".join(self.properties), - self.name, - self.args, - self.fmt) + return "Event('%s(%s) %s')" % (self.name, + self.args, + self.fmt) # Star matching on PRI is dangerous as one might have multiple # arguments with that format, hence the non-greedy version of it. _FMT =3D re.compile(r"(%[\d\.]*\w+|%.*?PRI\S+)") diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backen= d/dtrace.py index f0b58cc1585..6bce25c8d2d 100644 --- a/scripts/tracetool/backend/dtrace.py +++ b/scripts/tracetool/backend/dtrace.py @@ -79,8 +79,6 @@ def generate_rs_begin(events, group): # These are the Rust declarations of the .probes section semaphores # generated by dtrace(1) in its .o file output. for e in events: - if 'disable' in e.properties: - continue out(' #[allow(dead_code)]', f' static qemu_{e.name}_semaphore: UnsafeCell;') out('}', diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py index 9f06894623e..3754c7e06fd 100644 --- a/scripts/tracetool/format/c.py +++ b/scripts/tracetool/format/c.py @@ -16,9 +16,6 @@ =20 =20 def generate(events, backend, group): - active_events =3D [e for e in events - if "disable" not in e.properties] - header =3D "trace-" + group + ".h" =20 out('/* This file is autogenerated by tracetool, do not edit. */', @@ -62,7 +59,7 @@ def generate(events, backend, group): 'trace_init(trace_%(group)s_register_events)', group =3D group.lower()) =20 - backend.generate_begin(active_events, group) - for event in active_events: + backend.generate_begin(events, group) + for event in events: backend.generate(event, group) - backend.generate_end(active_events, group) + backend.generate_end(events, group) diff --git a/scripts/tracetool/format/d.py b/scripts/tracetool/format/d.py index e9e33dfe30a..df7780cb0af 100644 --- a/scripts/tracetool/format/d.py +++ b/scripts/tracetool/format/d.py @@ -30,9 +30,6 @@ =20 =20 def generate(events, backend, group): - events =3D [e for e in events - if "disable" not in e.properties] - # SystemTap's dtrace(1) warns about empty "provider qemu {}" but is ha= ppy # with an empty file. Avoid the warning. # But dtrace on macOS can't deal with empty files. diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index 544bbc0ba93..f719fe09397 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -46,14 +46,13 @@ def generate(events, backend, group): '#define %(api)s() ( \\', api=3De.api(e.QEMU_BACKEND_DSTATE)) =20 - if "disable" not in e.properties: - backend.generate_backend_dstate(e, group, check_trace_event_ge= t_state=3DFalse) + backend.generate_backend_dstate(e, group, check_trace_event_get_st= ate=3DFalse) =20 - if backend.check_trace_event_get_state: - event_id =3D 'TRACE_' + e.name.upper() - out(' trace_event_get_state_dynamic_by_id(%(event_id)s)= || \\', - event_id=3Devent_id) - backend.generate_backend_dstate(e, group, check_trace_even= t_get_state=3DTrue) + if backend.check_trace_event_get_state: + event_id =3D 'TRACE_' + e.name.upper() + out(' trace_event_get_state_dynamic_by_id(%(event_id)s) || = \\', + event_id=3Devent_id) + backend.generate_backend_dstate(e, group, check_trace_event_ge= t_state=3DTrue) =20 out(' false)') =20 @@ -63,16 +62,15 @@ def generate(events, backend, group): api=3De.api(), args=3De.args) =20 - if "disable" not in e.properties: - backend.generate(e, group, check_trace_event_get_state=3DFalse) + backend.generate(e, group, check_trace_event_get_state=3DFalse) =20 - if backend.check_trace_event_get_state: - event_id =3D 'TRACE_' + e.name.upper() - cond =3D "trace_event_get_state(%s)" % event_id - out(' if (%(cond)s) {', - cond=3Dcond) - backend.generate(e, group, check_trace_event_get_state=3DT= rue) - out(' }') + if backend.check_trace_event_get_state: + event_id =3D 'TRACE_' + e.name.upper() + cond =3D "trace_event_get_state(%s)" % event_id + out(' if (%(cond)s) {', + cond=3Dcond) + backend.generate(e, group, check_trace_event_get_state=3DTrue) + out(' }') out('}') =20 backend.generate_end(events, group) diff --git a/scripts/tracetool/format/log_stap.py b/scripts/tracetool/forma= t/log_stap.py index 259303a189d..3fa6c2dd3f2 100644 --- a/scripts/tracetool/format/log_stap.py +++ b/scripts/tracetool/format/log_stap.py @@ -90,9 +90,6 @@ def generate(events, backend, group): '') =20 for event_id, e in enumerate(events): - if 'disable' in e.properties: - continue - out('probe %(probeprefix)s.log.%(name)s =3D %(probeprefix)s.%(name= )s ?', '{', probeprefix=3Dprobeprefix(), diff --git a/scripts/tracetool/format/rs.py b/scripts/tracetool/format/rs.py index 1fddcee1ad2..97d89a981da 100644 --- a/scripts/tracetool/format/rs.py +++ b/scripts/tracetool/format/rs.py @@ -52,11 +52,10 @@ def generate(events, backend, group): '{', api=3De.api(e.QEMU_RUST_DSTATE)) =20 - if "disable" not in e.properties: - backend.generate_backend_dstate(e, group) - if backend.check_trace_event_get_state: - out(' trace_event_state_is_enabled(unsafe { _%(event_id= )s_DSTATE}) ||', - event_id =3D 'TRACE_' + e.name.upper()) + backend.generate_backend_dstate(e, group) + if backend.check_trace_event_get_state: + out(' trace_event_state_is_enabled(unsafe { _%(event_id)s_D= STATE}) ||', + event_id =3D 'TRACE_' + e.name.upper()) =20 out(' false', '}', @@ -68,15 +67,14 @@ def generate(events, backend, group): api=3De.api(e.QEMU_TRACE), args=3De.args.rust_decl()) =20 - if "disable" not in e.properties: - backend.generate(e, group, check_trace_event_get_state=3DFalse) - if backend.check_trace_event_get_state: - event_id =3D 'TRACE_' + e.name.upper() - out(' if trace_event_state_is_enabled(unsafe { _%(event= _id)s_DSTATE}) {', - event_id =3D event_id, - api=3De.api()) - backend.generate(e, group, check_trace_event_get_state=3DT= rue) - out(' }') + backend.generate(e, group, check_trace_event_get_state=3DFalse) + if backend.check_trace_event_get_state: + event_id =3D 'TRACE_' + e.name.upper() + out(' if trace_event_state_is_enabled(unsafe { _%(event_id)= s_DSTATE}) {', + event_id =3D event_id, + api=3De.api()) + backend.generate(e, group, check_trace_event_get_state=3DTrue) + out(' }') out('}', '') =20 diff --git a/scripts/tracetool/format/simpletrace_stap.py b/scripts/traceto= ol/format/simpletrace_stap.py index c7bde97a855..393d85319c7 100644 --- a/scripts/tracetool/format/simpletrace_stap.py +++ b/scripts/tracetool/format/simpletrace_stap.py @@ -24,9 +24,6 @@ def generate(events, backend, group): '') =20 for event_id, e in enumerate(events): - if 'disable' in e.properties: - continue - out('probe %(probeprefix)s.simpletrace.%(name)s =3D %(probeprefix)= s.%(name)s ?', '{', probeprefix=3Dprobeprefix(), diff --git a/scripts/tracetool/format/stap.py b/scripts/tracetool/format/st= ap.py index 285c9203ba7..e3d16b72d34 100644 --- a/scripts/tracetool/format/stap.py +++ b/scripts/tracetool/format/stap.py @@ -34,9 +34,6 @@ def stap_escape(identifier): =20 =20 def generate(events, backend, group): - events =3D [e for e in events - if "disable" not in e.properties] - out('/* This file is autogenerated by tracetool, do not edit. */', '/* SPDX-License-Identifier: GPL-2.0-or-later */', '') diff --git a/scripts/tracetool/format/ust_events_c.py b/scripts/tracetool/f= ormat/ust_events_c.py index 074226bfd37..93f88a03e90 100644 --- a/scripts/tracetool/format/ust_events_c.py +++ b/scripts/tracetool/format/ust_events_c.py @@ -16,9 +16,6 @@ =20 =20 def generate(events, backend, group): - events =3D [e for e in events - if "disabled" not in e.properties] - out('/* This file is autogenerated by tracetool, do not edit. */', '/* SPDX-License-Identifier: GPL-2.0-or-later */', '', diff --git a/scripts/tracetool/format/ust_events_h.py b/scripts/tracetool/f= ormat/ust_events_h.py index 76c883bc5c0..441e6a41933 100644 --- a/scripts/tracetool/format/ust_events_h.py +++ b/scripts/tracetool/format/ust_events_h.py @@ -16,9 +16,6 @@ =20 =20 def generate(events, backend, group): - events =3D [e for e in events - if "disabled" not in e.properties] - if group =3D=3D "all": include =3D "trace-ust-all.h" else: --=20 2.56.0 From nobody Thu Nov 5 07:29:17 2026 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=1793823647; cv=none; d=zohomail.com; s=zohoarc; b=mVfKy1WuoIH/XkI8jEB3tcSqNS39axPOTrNdDOX1c+1ZnLD9uzJ+ju1ZBAhZcpuLU+T91ZbyL0pJkdSj9bZdggUd6EkIbYqvvSDjlUs45nt8IHrFoFA0CUM+K9cRBAZSdnzNUJnBVqIvxd56URrHvVcMGzriezd5j8AN1iZpmPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1793823647; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+1r5cewGuHrpbpbmxHK1RLiqtliFySIlR2NRA4f1vA0=; b=CMxgVQ6zIgs3yDkygvDOmkNFSKvoBX4NjOXTxCv4jvq6lu7UdqX9BC34jILCY9kZgHWPKPbiYaJwfSo4+xNOMzSZK6N1/4mSlesQZa85y3Xtas/yxqTHHzLEQguIl2TRS03iAEyYWsi88vsPWlflqU7+N5QKgOt6kbV5PNjA8po= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1793823647380852.7180459808392; Wed, 4 Nov 2026 12:20:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xOhRk-0007FP-23; Wed, 04 Nov 2026 15:19:00 -0500 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 1xOhRd-00078K-7l for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xOhRb-0006Ds-3f for qemu-devel@nongnu.org; Wed, 04 Nov 2026 15:18:52 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-426-9LKdvOF9PRmCp-mtU7SZQQ-1; Wed, 04 Nov 2026 15:18:46 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3B3D018002C0; Wed, 4 Nov 2026 20:18:44 +0000 (UTC) Received: from localhost (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DE5B3187C36F; Wed, 4 Nov 2026 20:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793823530; 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=+1r5cewGuHrpbpbmxHK1RLiqtliFySIlR2NRA4f1vA0=; b=iRg0dxrMWWwXXeEqaI+tn3TyYzG4rM+PRUc/WLVjfE9Sdr2EIw/1iYHlHF9A2HBr+UCUiE vex7Gi6Qxy6pLdQ8cqpEUsQo+v+8/g39nSW+yUPjcblvkYuHqwiZVH9rlZernrogPcbQA/ 430KpWqZYdz/Pu6GXNiNtz3onchGE/c= X-MC-Unique: 9LKdvOF9PRmCp-mtU7SZQQ-1 X-Mimecast-MFC-AGG-ID: 9LKdvOF9PRmCp-mtU7SZQQ_1793823524 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Gerd Hoffmann , xen-devel@lists.xenproject.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Eric Blake , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Paolo Bonzini , Stefano Stabellini , Alexey Kardashevskiy , Richard Henderson , Stefan Hajnoczi , Helge Deller , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL v2 25/25] trace: remove 'trace_event_get_state' wrapper Date: Wed, 4 Nov 2026 15:18:01 -0500 Message-ID: <20261104201802.11556-26-stefanha@redhat.com> In-Reply-To: <20261104201802.11556-1-stefanha@redhat.com> References: <20261104201802.11556-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1793823649584158500 From: Daniel P. Berrang=C3=A9 The 'trace_event_get_state' macro is a wrapper around the 'trace_event_get_state_dynamic_by_id' macro, which is a direct check of the _TRACE_...._DSTATE global variable. The only code that should be using this is the generated trace probes, but the name looks rather appealing causing it to be mistakenly used in other places, instead of the recommended 'trace_event_get_state_dynamic_backends'. Removing the 'trace_event_get_state' macro reduces the potential for confusion. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20261102142844.3464712-26-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- tests/tracetool/all.h | 8 ++++---- tests/tracetool/ftrace.h | 4 ++-- tests/tracetool/log.h | 4 ++-- tests/tracetool/simple.h | 4 ++-- tests/tracetool/syslog.h | 4 ++-- trace/control.h | 9 --------- scripts/tracetool/backend/__init__.py | 3 ++- scripts/tracetool/backend/log.py | 2 +- scripts/tracetool/format/h.py | 2 +- 9 files changed, 16 insertions(+), 24 deletions(-) diff --git a/tests/tracetool/all.h b/tests/tracetool/all.h index 01971827e4b..d4c91cdd1a4 100644 --- a/tests/tracetool/all.h +++ b/tests/tracetool/all.h @@ -51,14 +51,14 @@ void _simple_trace_test_wibble(void *context, int value= ); static inline void trace_test_blah(void *context, const char *filename) { QEMU_TEST_BLAH(context, filename); - if (trace_event_get_state(TRACE_TEST_BLAH) && + if (trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) && qemu_loglevel_mask(LOG_TRACE)) { #line 4 "trace-events" qemu_log("test_blah " "Blah context=3D%p filename=3D%s" "\n", = context, filename); #line 59 "all.h" } tracepoint(qemu, test_blah, context, filename); - if (trace_event_get_state(TRACE_TEST_BLAH)) { + if (trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH)) { #line 4 "trace-events" ftrace_write("test_blah " "Blah context=3D%p filename=3D%s" "\n" ,= context, filename); #line 65 "all.h" @@ -80,14 +80,14 @@ static inline void trace_test_blah(void *context, const= char *filename) static inline void trace_test_wibble(void *context, int value) { QEMU_TEST_WIBBLE(context, value); - if (trace_event_get_state(TRACE_TEST_WIBBLE) && + if (trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) && qemu_loglevel_mask(LOG_TRACE)) { #line 5 "trace-events" qemu_log("test_wibble " "Wibble context=3D%p value=3D%d" "\n",= context, value); #line 88 "all.h" } tracepoint(qemu, test_wibble, context, value); - if (trace_event_get_state(TRACE_TEST_WIBBLE)) { + if (trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE)) { #line 5 "trace-events" ftrace_write("test_wibble " "Wibble context=3D%p value=3D%d" "\n" = , context, value); #line 94 "all.h" diff --git a/tests/tracetool/ftrace.h b/tests/tracetool/ftrace.h index 4eba6b4d599..b55ee08bbfe 100644 --- a/tests/tracetool/ftrace.h +++ b/tests/tracetool/ftrace.h @@ -19,7 +19,7 @@ extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; =20 static inline void trace_test_blah(void *context, const char *filename) { - if (trace_event_get_state(TRACE_TEST_BLAH)) { + if (trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH)) { #line 4 "trace-events" ftrace_write("test_blah " "Blah context=3D%p filename=3D%s" "\n" ,= context, filename); #line 26 "ftrace.h" @@ -32,7 +32,7 @@ static inline void trace_test_blah(void *context, const c= har *filename) =20 static inline void trace_test_wibble(void *context, int value) { - if (trace_event_get_state(TRACE_TEST_WIBBLE)) { + if (trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE)) { #line 5 "trace-events" ftrace_write("test_wibble " "Wibble context=3D%p value=3D%d" "\n" = , context, value); #line 39 "ftrace.h" diff --git a/tests/tracetool/log.h b/tests/tracetool/log.h index 9afbe721a47..02bb1309e20 100644 --- a/tests/tracetool/log.h +++ b/tests/tracetool/log.h @@ -20,7 +20,7 @@ extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; =20 static inline void trace_test_blah(void *context, const char *filename) { - if (trace_event_get_state(TRACE_TEST_BLAH) && + if (trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH) && qemu_loglevel_mask(LOG_TRACE)) { #line 4 "trace-events" qemu_log("test_blah " "Blah context=3D%p filename=3D%s" "\n", = context, filename); @@ -35,7 +35,7 @@ static inline void trace_test_blah(void *context, const c= har *filename) =20 static inline void trace_test_wibble(void *context, int value) { - if (trace_event_get_state(TRACE_TEST_WIBBLE) && + if (trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE) && qemu_loglevel_mask(LOG_TRACE)) { #line 5 "trace-events" qemu_log("test_wibble " "Wibble context=3D%p value=3D%d" "\n",= context, value); diff --git a/tests/tracetool/simple.h b/tests/tracetool/simple.h index 9b066364b0a..0b9e7cba35c 100644 --- a/tests/tracetool/simple.h +++ b/tests/tracetool/simple.h @@ -20,7 +20,7 @@ void _simple_trace_test_wibble(void *context, int value); =20 static inline void trace_test_blah(void *context, const char *filename) { - if (trace_event_get_state(TRACE_TEST_BLAH)) { + if (trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH)) { _simple_trace_test_blah(context, filename); } } @@ -31,7 +31,7 @@ static inline void trace_test_blah(void *context, const c= har *filename) =20 static inline void trace_test_wibble(void *context, int value) { - if (trace_event_get_state(TRACE_TEST_WIBBLE)) { + if (trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE)) { _simple_trace_test_wibble(context, value); } } diff --git a/tests/tracetool/syslog.h b/tests/tracetool/syslog.h index 6a9304489f6..173b35dcf69 100644 --- a/tests/tracetool/syslog.h +++ b/tests/tracetool/syslog.h @@ -19,7 +19,7 @@ extern uint8_t _TRACE_TEST_WIBBLE_DSTATE; =20 static inline void trace_test_blah(void *context, const char *filename) { - if (trace_event_get_state(TRACE_TEST_BLAH)) { + if (trace_event_get_state_dynamic_by_id(TRACE_TEST_BLAH)) { #line 4 "trace-events" syslog(LOG_INFO, "test_blah " "Blah context=3D%p filename=3D%s" , = context, filename); #line 26 "syslog.h" @@ -32,7 +32,7 @@ static inline void trace_test_blah(void *context, const c= har *filename) =20 static inline void trace_test_wibble(void *context, int value) { - if (trace_event_get_state(TRACE_TEST_WIBBLE)) { + if (trace_event_get_state_dynamic_by_id(TRACE_TEST_WIBBLE)) { #line 5 "trace-events" syslog(LOG_INFO, "test_wibble " "Wibble context=3D%p value=3D%d" ,= context, value); #line 39 "syslog.h" diff --git a/trace/control.h b/trace/control.h index 71f254728d4..dfb52b23ac4 100644 --- a/trace/control.h +++ b/trace/control.h @@ -97,15 +97,6 @@ static uint32_t trace_event_get_id(TraceEvent *ev); */ static const char * trace_event_get_name(TraceEvent *ev); =20 -/** - * trace_event_get_state: - * @id: Event identifier name. - * - * Get the tracing state of an event, both static and the QEMU dynamic sta= te. - */ -#define trace_event_get_state(id) \ - (trace_event_get_state_dynamic_by_id(id)) - /** * trace_event_get_state_backends: * @id: Event identifier name. diff --git a/scripts/tracetool/backend/__init__.py b/scripts/tracetool/back= end/__init__.py index 72f549c77c4..2749c4e6315 100644 --- a/scripts/tracetool/backend/__init__.py +++ b/scripts/tracetool/backend/__init__.py @@ -26,7 +26,8 @@ considered "public". CHECK_TRACE_EVENT_GET_STATE If exists and is set to 'True', the backend-sp= ecific code inside the tracepoint is emitted within an - ``if trace_event_get_state()`` conditional. + ``if trace_event_get_state_dynamic_by_id()`` + conditional. =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D =20 =20 diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/l= og.py index 0e7909efe8b..4f620c5492f 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -28,7 +28,7 @@ def generate_h(event, group): if len(event.args) > 0: argnames =3D ", " + argnames =20 - out(' if (trace_event_get_state(%(event_id)s) &&', + out(' if (trace_event_get_state_dynamic_by_id(%(event_id)s) &&', ' qemu_loglevel_mask(LOG_TRACE)) {', '#line %(event_lineno)d "%(event_filename)s"', ' qemu_log("%(name)s " %(fmt)s "\\n"%(argnames)s);', diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index f719fe09397..ad4ce4414fe 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -66,7 +66,7 @@ def generate(events, backend, group): =20 if backend.check_trace_event_get_state: event_id =3D 'TRACE_' + e.name.upper() - cond =3D "trace_event_get_state(%s)" % event_id + cond =3D "trace_event_get_state_dynamic_by_id(%s)" % event_id out(' if (%(cond)s) {', cond=3Dcond) backend.generate(e, group, check_trace_event_get_state=3DTrue) --=20 2.56.0