From nobody Mon Apr 29 14:55:25 2024 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=1593094129; cv=none; d=zohomail.com; s=zohoarc; b=fIU9qSBBqxXJU6s3Zhs+PKIEW30r2cjjll6Krc+CrLDvEakwmdvZJRsNyoMMphVG+ygUTrtZWpjh3Vjo2wwzin03PKy1P2sofPkbiy9nSFh0UnPa/ts3F3jmVExVy3H6iSTXfXnHIzQ9O0/1OtMbgttiaZHTIKOpnOcpNBvrytY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593094129; 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=NsSPK6FsQmHVmLP45bUM/hm96AQvKSo/hGYkFVL3Fck=; b=FHz/22v1HuL7RGbpfLth9kFMjiNFl02maFLKKNKZDb5btjowNIXZ5szrylmbZhHVu2HJv97ro58drVjg7WpNEy5LOZiZ53+q9/Cy80bGKBQV0fZZe8k1aiclfKay2L0CoLfEu8MuZbBO63LSr4Skf9mBWhfuR/kfD/cz1tukcpE= 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 15930941296717.349547875564781; Thu, 25 Jun 2020 07:08:49 -0700 (PDT) Received: from localhost ([::1]:56164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joSYY-0003UZ-JT for importer@patchew.org; Thu, 25 Jun 2020 10:08:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joSXx-00035m-NE for qemu-devel@nongnu.org; Thu, 25 Jun 2020 10:08:09 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:39518 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joSXv-0003VY-CB for qemu-devel@nongnu.org; Thu, 25 Jun 2020 10:08:09 -0400 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-67-duJkgTSEN5KHjXTuhA-3lg-1; Thu, 25 Jun 2020 10:08:03 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CD6F6800C64 for ; Thu, 25 Jun 2020 14:08:02 +0000 (UTC) Received: from localhost (ovpn-115-49.ams2.redhat.com [10.36.115.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E49171688; Thu, 25 Jun 2020 14:07:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593094085; 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=NsSPK6FsQmHVmLP45bUM/hm96AQvKSo/hGYkFVL3Fck=; b=Obr3Cg/vdC0XeGK/kRWKMO2zy9je0K4/VYGP/poi0VUo4OlscymAhV+k6hKM0FfakdxpTp rnyYeWr620txofldc41u9zy/n9IS4vP4eWbXjpm7r5FdtVEV3ivd+DkhTiMRMJ21avAQV9 2Y3p/T8bsIihtJezMOJJ+DdJuIYGfTo= X-MC-Unique: duJkgTSEN5KHjXTuhA-3lg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH] tracetool: work around ust include conflict Date: Thu, 25 Jun 2020 15:07:57 +0100 Message-Id: <20200625140757.237012-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=207.211.31.120; envelope-from=stefanha@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/25 01:47:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: armbru@redhat.com, Stefan Hajnoczi 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" Both the dtrace and ust backends may include but LTTng Userspace Tracer 2.11 and later requires SDT_USE_VARIADIC to be defined before including the header file. This is a classic problem with C header files included from different parts of a program. If the same header is included twice within the same compilation unit then the first inclusion determines the macro environment. Work around this by defining SDT_USE_VARIADIC in the dtrace backend too. It doesn't hurt and fixes a missing STAP_PROBEV() compiler error when the ust backend is enabled together with the dtrace backend. Signed-off-by: Stefan Hajnoczi --- I am also sending a fix to the LTTng Userspace Tracer project to add -DSDT_USE_VARIADIC to the pkg-config CFLAGS so that applications define the macro consistently. But this patch is still needed as a workaround for lttng-ust 2.11. --- scripts/tracetool/backend/dtrace.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backen= d/dtrace.py index 638990db79..79dbc2fa27 100644 --- a/scripts/tracetool/backend/dtrace.py +++ b/scripts/tracetool/backend/dtrace.py @@ -40,6 +40,12 @@ def generate_h_begin(events, group): else: header =3D "trace-dtrace.h" =20 + # Workaround for ust backend, which also includes and may + # require SDT_USE_VARIADIC to be defined. If dtrace includes + # first without defining SDT_USE_VARIADIC then ust breaks because the + # STAP_PROBEV() macro is not defined. + out('#define SDT_USE_VARIADIC 1') + out('#include "%s"' % header, '') =20 --=20 2.26.2