From nobody Fri Apr 26 11:33:52 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=1596132996; cv=none; d=zohomail.com; s=zohoarc; b=RThxcqQk6Qh7/9N0rWEVQ9lYmue2KBCJr6ID6K4HlLLnnj6dltFJ/VpgpUvxoAvKVbaYcP1U5ZKTuVrjX7ADeWbY98ZcHL+0lkGjUfupYu4NPbPGdoPobQrOQI5JHilgK361FcHpV+crHFRInxqQUqLGCNTCHY2d/iXw7kAQVd0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596132996; 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=gbmL4Rhz2i+65G7NEIp7+3CCiuvMD5mIk47Yeovyko8=; b=SbpWqkh2npqTwJMkHo5N1GbwCZAmihmCXBklOYQf1ns70DNnFvDw9P+arIy3ZCn8RVoqETce28/quh6wbkiOcusZAW1mlpRIChqHwWXcSmoJaijWjN/a9YLHQH8oD3OHQ+jDNPQDTVRfQmflxw8det7o75sVOj4WXUJT+PyWWao= 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 1596132996918729.2578800499185; Thu, 30 Jul 2020 11:16:36 -0700 (PDT) Received: from localhost ([::1]:43676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1D6Z-0007jN-FF for importer@patchew.org; Thu, 30 Jul 2020 14:16:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1D4j-0006lD-4s for qemu-devel@nongnu.org; Thu, 30 Jul 2020 14:14:41 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:44295 helo=us-smtp-delivery-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 1k1D4h-0001T4-ID for qemu-devel@nongnu.org; Thu, 30 Jul 2020 14:14:40 -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-195-kfBtc0pYOXCu4dRUrVnFPg-1; Thu, 30 Jul 2020 14:14:33 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC86A57; Thu, 30 Jul 2020 18:14:31 +0000 (UTC) Received: from localhost (ovpn-114-112.ams2.redhat.com [10.36.114.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD570100239B; Thu, 30 Jul 2020 18:14:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596132878; 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=gbmL4Rhz2i+65G7NEIp7+3CCiuvMD5mIk47Yeovyko8=; b=Jbu1T+njlTRAZVar2/2RsZKit0GoKZ68sqDUzJKVLWjVbsJkHcj68lizrJvx+0M6zsfVfC pzzQIphMCmk7Ck/EQ31kXKeI2RmGLh1LrNS97QxH5/uqIJnIbaSux8Hdqlv2Gg0o1Vwljq iDphYYzqhCqMSqNxM0rotRJjVjtkftw= X-MC-Unique: kfBtc0pYOXCu4dRUrVnFPg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL for-5.1 1/2] trace/simple: Allow enabling simple traces from command line Date: Thu, 30 Jul 2020 19:14:13 +0100 Message-Id: <20200730181414.160066-2-stefanha@redhat.com> In-Reply-To: <20200730181414.160066-1-stefanha@redhat.com> References: <20200730181414.160066-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.81; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/30 03:51:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.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_H2=-1, 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: Peter Maydell , Josh DuBois , Eduardo Habkost , Josh DuBois , Gerd Hoffmann , Stefan Hajnoczi , Cleber Rosa , Paolo Bonzini 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: Josh DuBois The simple trace backend is enabled / disabled with a call to st_set_trace_file_enabled(). When initializing tracing from the command-line, this must be enabled on startup. (Prior to db25d56c014aa1a9, command-line initialization of simple trace worked because every call to st_set_trace_file enabled tracing.) Fixes: db25d56c014aa1a96319c663e0a60346a223b31e Signed-off-by: Josh DuBois Message-id: 20200723053359.256928-1-josh@joshdubois.com Signed-off-by: Stefan Hajnoczi --- trace/control.c | 1 + 1 file changed, 1 insertion(+) diff --git a/trace/control.c b/trace/control.c index 2ffe000818..6558b5c906 100644 --- a/trace/control.c +++ b/trace/control.c @@ -225,6 +225,7 @@ void trace_init_file(const char *file) { #ifdef CONFIG_TRACE_SIMPLE st_set_trace_file(file); + st_set_trace_file_enabled(true); #elif defined CONFIG_TRACE_LOG /* * If both the simple and the log backends are enabled, "--trace file" --=20 2.26.2 From nobody Fri Apr 26 11:33:52 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=1596133110; cv=none; d=zohomail.com; s=zohoarc; b=MRyo81RhFWWBu2WdRl8AhOXOGvtmfly9hAuMPvoc3Mf8LE7DS8RSUHRCFcnNX7kO0oza0uNhE3wlphusyW+XQsFz8OB3x7U6q+54katWa2aKi+ECfaYKs5kvJeRwsQeSE3J1f4X8sFFu4395Eo6Lrg54hBRFt9lM4VpOdImFYtk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596133110; 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=ISqQ5uIw5KF4G3fNDYh9e7g0ivRbimnlWj30R7n1OSQ=; b=YDeSphKGUvgwJ3pycoANkjnxc0znO4ipZ+dGiLvnCGhh5ciA76KgusFWO9lumOSFFrSyeiqZAHqPpIXe9s1OBHJU9w4A3QRufHVq5CNMaV9Ev0iE5msFtMNwhWOQtbJc4nnpWnv1luXTauQWxHZVyPYDATV+sE83YnCdcoAnjiA= 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 1596133110110327.17495713421295; Thu, 30 Jul 2020 11:18:30 -0700 (PDT) Received: from localhost ([::1]:47978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1D8O-000158-S3 for importer@patchew.org; Thu, 30 Jul 2020 14:18:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1D4n-0006me-LY for qemu-devel@nongnu.org; Thu, 30 Jul 2020 14:14:45 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:45578 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 1k1D4j-0001T8-9K for qemu-devel@nongnu.org; Thu, 30 Jul 2020 14:14:45 -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-311-MxbGVOVQPCGPAgMfeoBSxw-1; Thu, 30 Jul 2020 14:14:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C548119200C2; Thu, 30 Jul 2020 18:14:33 +0000 (UTC) Received: from localhost (ovpn-114-112.ams2.redhat.com [10.36.114.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C13B6111F; Thu, 30 Jul 2020 18:14:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596132879; 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=ISqQ5uIw5KF4G3fNDYh9e7g0ivRbimnlWj30R7n1OSQ=; b=aLfv7FamhXbzonEYYGTgn3AcX/1dvOW2Odf+0Dtg61nlr4YxbTvrFACZE20Ncn1x1YsAjC bLPNIOtYZ8k5WrUH6n/29Yzze/3mtowIBn00/6gQHAFu48SdFrCzUigyUMa+X62ig9e8+y a2un6rf6whTi07CfliVqC9i/v+UVGVs= X-MC-Unique: MxbGVOVQPCGPAgMfeoBSxw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL for-5.1 2/2] tracetool: carefully define SDT_USE_VARIADIC Date: Thu, 30 Jul 2020 19:14:14 +0100 Message-Id: <20200730181414.160066-3-stefanha@redhat.com> In-Reply-To: <20200730181414.160066-1-stefanha@redhat.com> References: <20200730181414.160066-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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/07/30 03:59:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.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_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Peter Maydell , Eduardo Habkost , Gerd Hoffmann , Stefan Hajnoczi , Cleber Rosa , Paolo Bonzini 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" The dtrace backend defines SDT_USE_VARIADIC as a workaround for a conflict with a LTTng UST header file, which requires SDT_USE_VARIADIC to be defined. LTTng UST breaks if included after generated dtrace headers because SDT_USE_VARIADIC will already be defined: #ifdef LTTNG_UST_HAVE_SDT_INTEGRATION #define SDT_USE_VARIADIC <-- error, it's already defined #include Be more careful when defining SDT_USE_VARIADIC. This fixes the build when both the dtrace and ust tracers are enabled at the same time. Fixes: 27e08bab94f7c6ebe0b75938c98c394c969e3fd8 ("tracetool: work around us= t include conflict") Signed-off-by: Stefan Hajnoczi Message-id: 20200729153926.127083-1-stefanha@redhat.com Signed-off-by: Stefan Hajnoczi --- scripts/tracetool/backend/dtrace.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backen= d/dtrace.py index b7fe4c1b50..fc0c8fc52f 100644 --- a/scripts/tracetool/backend/dtrace.py +++ b/scripts/tracetool/backend/dtrace.py @@ -44,11 +44,15 @@ def generate_h_begin(events, group): # 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('#ifndef SDT_USE_VARIADIC') out('#define SDT_USE_VARIADIC 1') + out('#endif') =20 out('#include "%s"' % header, '') =20 + out('#undef SDT_USE_VARIADIC') + # SystemTap defines __ENABLED() but other DTrace # implementations might not. for e in events: --=20 2.26.2