From nobody Mon Feb 9 23:01:34 2026 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=1612194937; cv=none; d=zohomail.com; s=zohoarc; b=GhYDEOTdKZT1vchEPx6/1v3sw2yvSsv67S8QWdkecq6rxOxG2JJIKFYoMd+Nxcb2Bc96ruZ1yiceYDBGqrGa4coHNvrfbt5lNbFqhFQ99GAS1pup2xLRbGuFIGP9l5TYBA8hmJQpSceSrLAldG6F3aP8htxZCWr7WqdmPvrxd8Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612194937; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i8xowd5alt2PfqYt1DWcrDTG7LsgZ+d+cXQyu+4+Rgo=; b=XoGoMZbc/gaGRRUY5sWsVvF7mubJSX9kK7Bh73xf6Fd5OTa1h4gxyvUBcMPrldFjFKitNHxkrnV6TWERnYARQOKJjAhYNwNs+g6EvM6YSkOzhGIGfNGzYrbED8b/iyY6DggzQrwWc92UyS1Wis2fjMcJhCa0ED5t4TFNX9C+GQE= 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 1612194937378569.3072945115929; Mon, 1 Feb 2021 07:55:37 -0800 (PST) Received: from localhost ([::1]:32868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6bY8-00081r-0o for importer@patchew.org; Mon, 01 Feb 2021 10:55:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6bSJ-0000gX-GO for qemu-devel@nongnu.org; Mon, 01 Feb 2021 10:49:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44875) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6bSG-0007jh-Qy for qemu-devel@nongnu.org; Mon, 01 Feb 2021 10:49:35 -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-242-4Y-7mmqFO9OTeplZaxNd5A-1; Mon, 01 Feb 2021 10:49:29 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B62DD8FB84C; Mon, 1 Feb 2021 15:47:57 +0000 (UTC) Received: from localhost (ovpn-115-140.ams2.redhat.com [10.36.115.140]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CA4D84175; Mon, 1 Feb 2021 15:47:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612194572; 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=i8xowd5alt2PfqYt1DWcrDTG7LsgZ+d+cXQyu+4+Rgo=; b=VXJGzGXMVq838K9mYzw1BHKnhyhljjh7QYDly//9e5GEJAhHphsMBLgJzGUJSiOBYdRUc9 fZM05cDqyJrn/IKXgGmSmgyHSWMQmVptqEu6d85fP3Eh4SrMLIRM5WRa42VOmndW0YwEZ6 lTqy3IGxYItvidhMtOOwPy7WbOlckd4= X-MC-Unique: 4Y-7mmqFO9OTeplZaxNd5A-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL 04/11] tracetool: fix "PRI" macro decoding Date: Mon, 1 Feb 2021 15:46:56 +0000 Message-Id: <20210201154703.180022-5-stefanha@redhat.com> In-Reply-To: <20210201154703.180022-1-stefanha@redhat.com> References: <20210201154703.180022-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eduardo Habkost , qemu-block@nongnu.org, Markus Armbruster , Stefan Hajnoczi , Cleber Rosa , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Laurent Vivier macro is not reset after use, so the format decoded is always the one of the first "PRI" in the format string. For instance: vhost_vdpa_set_config(void *dev, uint32_t offset, uint32_t size, \ uint32_t flags) "dev: %p offset: %"PRIu32" \ size: %"PRIu32" flags: 0x%"PRIx32 generates: printf("%d@%d vhost_vdpa_set_config dev: %p offset: %u size: %u \ flags: 0x%u\n", pid(), gettimeofday_ns(), dev, offset, \ size, flags) for the "flags" parameter, we can see a "0x%u" rather than a "0x%x" because the first macro was "PRIu32" (for offset). In the loop, macro becomes "PRIu32PRIu32PRIx32", and c_macro_to_format() returns always macro[3] ('u' in this case). This patch resets macro after the format has been decoded. Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20210105191721.120463-3-lvivier@redhat.com Signed-off-by: Stefan Hajnoczi --- scripts/tracetool/format/log_stap.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/tracetool/format/log_stap.py b/scripts/tracetool/forma= t/log_stap.py index b486beb672..3e1186ae9c 100644 --- a/scripts/tracetool/format/log_stap.py +++ b/scripts/tracetool/format/log_stap.py @@ -54,6 +54,7 @@ def c_fmt_to_stap(fmt): else: if state =3D=3D STATE_MACRO: bits.append(c_macro_to_format(macro)) + macro =3D "" state =3D STATE_LITERAL elif fmt[i] =3D=3D ' ' or fmt[i] =3D=3D '\t': if state =3D=3D STATE_MACRO: --=20 2.29.2