From nobody Tue Nov 18 09:16:24 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1609938230; cv=none; d=zohomail.com; s=zohoarc; b=Uy+WH8fsUdXuDlzAKIGt2NKW0K3kzg5GWFh4nms5KMaZYPri6VY/4KNdXnn0xxtpRxMZoK+DAR2d21gW5/teh/wq5RHFqbhBzKjiSDZILjhntGdgeweYTom+auI6VKBacnFQqxOx1iD2+rY5d6SpXCVlMMO5kNYFnAuJZPhIsNQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609938230; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=9cEiEhRiHfzTJDLKT6mHy/pw4zaPX72sfCLNf6zbJSs=; b=EiD+UIf2prxPqRDgFr7pTmyuKDvUePbe+Z9K9R0Qa0qd2p0z5UCch45eqX/bjXKXGGhbDaNhKUVRNN3SOGCR3pbF6i5ZcuHqZwkMjAFpPm9gIqwy5s74x7HC55KbVqSJWeHkiZGmCs8hPTig8nMi1ryd0TRbnJVuErUULo80H64= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1609938230527269.57960095267515; Wed, 6 Jan 2021 05:03:50 -0800 (PST) Received: from localhost ([::1]:46052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kx8Td-00077l-9Q for importer@patchew.org; Wed, 06 Jan 2021 08:03:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kx8Sd-0006f9-Ep for qemu-devel@nongnu.org; Wed, 06 Jan 2021 08:02:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kx8Sb-0003Xb-3L for qemu-devel@nongnu.org; Wed, 06 Jan 2021 08:02:46 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-547-cNeCxBKgOv6tYZgAHk0LQw-1; Wed, 06 Jan 2021 08:02:42 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B6B0CC745A for ; Wed, 6 Jan 2021 13:02:41 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-197.ams2.redhat.com [10.36.114.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FAAE5D9D2; Wed, 6 Jan 2021 13:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609938164; 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; bh=9cEiEhRiHfzTJDLKT6mHy/pw4zaPX72sfCLNf6zbJSs=; b=aRmlhzp86c7srpwA3F4zYjCaFC2PrdDiIJBjaXWMGveABQL3TUgM5Z8sqOigG/nCSLfBXI R01ScXZXPaR+LKpezEuLseqNP/cD8G9Jf8Y0aQNU7xsg/qKVAK/gb8JcrmTvnmE4/gSlIp 2+LdwCcq4+RJr3htjJBDE1CAMoa2SBI= X-MC-Unique: cNeCxBKgOv6tYZgAHk0LQw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2] tracetool: also strip %l and %ll from systemtap format strings Date: Wed, 6 Jan 2021 13:02:39 +0000 Message-Id: <20210106130239.1004729-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.252, 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_NONE=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , William Cohen , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) All variables are 64-bit and so %l / %ll are not required, and the latter is actually invalid: $ sudo stap -e 'probe begin{printf ("BEGIN")}' -I . parse error: invalid or missing conversion specifier saw: operator ',' at ./qemu-system-x86_64-log.stp:15118:101 source: printf("%d@%d vhost_vdpa_set_log_base dev: %p base: 0x%x= size: %llu refcnt: %d fd: %d log: %p\n", pid(), gettimeofday_ns(), dev, base, size, re= fcnt, fd, log) ^ Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Laurent Vivier --- scripts/tracetool/format/log_stap.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) In v2: - Change existing logic that stripped %z to handle %l/%ll too diff --git a/scripts/tracetool/format/log_stap.py b/scripts/tracetool/forma= t/log_stap.py index b486beb672..fac911a0f4 100644 --- a/scripts/tracetool/format/log_stap.py +++ b/scripts/tracetool/format/log_stap.py @@ -77,7 +77,12 @@ def c_fmt_to_stap(fmt): elif state =3D=3D STATE_LITERAL: bits.append(literal) =20 - fmt =3D re.sub("%(\d*)z(x|u|d)", "%\\1\\2", "".join(bits)) + # All variables in systemtap are 64-bit in size + # The "%l" integer size qualifier is thus redundant + # and "%ll" is not valid at all. Simiarly the size_t + # based "%z" size qualifier is not valid. We just + # strip all size qualifiers for sanity. + fmt =3D re.sub("%(\d*)(l+|z)(x|u|d)", "%\\1\\3", "".join(bits)) return fmt =20 def generate(events, backend, group): --=20 2.29.2