From nobody Sat May 4 14:23:40 2024 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605775634; cv=none; d=zohomail.com; s=zohoarc; b=KhxNP4UY7BpzcmtYcWxfgY95zkEDHAOl0eqVrBVQUKxDctVDR2SXVNVHqXCLCfvy0mbtEXTA3QTs4hG6rZpC+KV2o9GWyxQFCHuqcSJzX+L9YPkP6Y74sf0qSKuJAy1PBG2QzxjDkvpfI7xMZ2XtRuaHofS1c6BOTjhg0bG1B2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605775634; 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=MM8jCfmBjgxwtUvR4dGJD1DN6ETQTKzmpXji6sS0Wzc=; b=RwEaKJX/fpX9F5LiXQ1ToXENtJM2niaBL5v8vfQ0av79B7msYhkV5aREMCynGMgjlGjTcMk8ukiVR2nx0g4Nqw8b2ph+o0haop5DTDFp4dwbRtru4q3YbSg7wWHGsuBJ9MTXmCExe226Eg+GVtJ4qQU6HWj5OqR6HPBHgHOcaJA= 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=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 1605775634243407.04292953978916; Thu, 19 Nov 2020 00:47:14 -0800 (PST) Received: from localhost ([::1]:57174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kffaz-0007OG-5G for importer@patchew.org; Thu, 19 Nov 2020 03:47:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kffYt-0005bx-HT for qemu-devel@nongnu.org; Thu, 19 Nov 2020 03:45:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28800) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kffYr-0002K3-C4 for qemu-devel@nongnu.org; Thu, 19 Nov 2020 03:45:03 -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-219-A91H2cslNu-l8QAire0ocA-1; Thu, 19 Nov 2020 03:44:57 -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 5619364157 for ; Thu, 19 Nov 2020 08:44:56 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-65.ams2.redhat.com [10.36.112.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B8995D9D5; Thu, 19 Nov 2020 08:44:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 16025A1EE; Thu, 19 Nov 2020 09:44:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605775500; 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=MM8jCfmBjgxwtUvR4dGJD1DN6ETQTKzmpXji6sS0Wzc=; b=hZpO1Fl1EUaL1H1r8uX6CRIIWB7QCabwBW1UIKXxN4M6zHDRjGBwaBdBu682VimySFHq2R i+PT7RemPQOtRa2saV3ich2AHzA4tbGrjgHX5gBCQAKjHMBBnxA8wJzxhMXBdrHICC15XV pbhDIdPFHsNWJRc2dmBqxPsE9jM5npE= X-MC-Unique: A91H2cslNu-l8QAire0ocA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 1/4] meson: add trace_events_config[] Date: Thu, 19 Nov 2020 09:44:45 +0100 Message-Id: <20201119084448.24397-2-kraxel@redhat.com> In-Reply-To: <20201119084448.24397-1-kraxel@redhat.com> References: <20201119084448.24397-1-kraxel@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=kraxel@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=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/19 03:44:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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: Gerd Hoffmann , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" It's an array of dicts, where each dict holds the configuration for one trace-events file. For now just fill it from trace_events_subdirs. Signed-off-by: Gerd Hoffmann Reviewed-by: Stefan Hajnoczi --- meson.build | 1 + trace/meson.build | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 132bc4978242..04bd9b57e401 100644 --- a/meson.build +++ b/meson.build @@ -1365,6 +1365,7 @@ target_softmmu_arch =3D {} =20 # TODO: add each directory to the subdirs from its own meson.build, once # we have those +trace_events_config =3D [] trace_events_subdirs =3D [ 'accel/kvm', 'accel/tcg', diff --git a/trace/meson.build b/trace/meson.build index d5fc45c628d4..66395d3e2ba7 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -1,12 +1,23 @@ specific_ss.add(files('control-target.c')) =20 trace_events_files =3D [] -foreach dir : [ '.' ] + trace_events_subdirs - trace_events_file =3D meson.source_root() / dir / 'trace-events' + +trace_events_config +=3D { + 'file' : meson.source_root() / 'trace-events', + 'group' : 'root', +} +foreach dir : trace_events_subdirs + trace_events_config +=3D { + 'file' : meson.source_root() / dir / 'trace-events', + 'group' : dir.underscorify(), + } +endforeach + +foreach c : trace_events_config + trace_events_file =3D c.get('file') trace_events_files +=3D [ trace_events_file ] - group_name =3D dir =3D=3D '.' ? 'root' : dir.underscorify() - group =3D '--group=3D' + group_name - fmt =3D '@0@-' + group_name + '.@1@' + group =3D '--group=3D' + c.get('group') + fmt =3D '@0@-' + c.get('group') + '.@1@' =20 trace_h =3D custom_target(fmt.format('trace', 'h'), output: fmt.format('trace', 'h'), --=20 2.27.0 From nobody Sat May 4 14:23:40 2024 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605775857; cv=none; d=zohomail.com; s=zohoarc; b=kdk+nOcrVwSj/myGkDdxQ6oH9SR6TYYbEvr3JO8jY5nJcANPCxKsPmv2UpilwBQoS4CTosAN2v4cSITL6K3UD3asf9H5bAFXoGyEeU6GF6GyuiU2RN5+gF3QXOsiO8uk4nFGhkXW45jDVOogenVGWv5njxEvj0AhnMOYkng50z8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605775857; 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=XcBuP2kU2fxwlpdRUgR9Hp38wxCt6wO/FcLbo2CAgZM=; b=UZPO8IlpDIuE4+D2UGu838ASaXcSkhcO/EdECLMzzCzlO5SmoyNXOx4MXJLB2osKpgyr748VnvsRurX87TbRNFkuYD9iNxI5NwjPmD6IQWB5yT8+DqUYFc6pjZ6ic9brYnCCFILyOwB7YbVcjIqFZ0uLeNYwvw5P6jKpdFdD0m8= 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=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 1605775857469502.546799071481; Thu, 19 Nov 2020 00:50:57 -0800 (PST) Received: from localhost ([::1]:36782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kffeY-0002eH-2J for importer@patchew.org; Thu, 19 Nov 2020 03:50:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kffZB-0005ti-3e for qemu-devel@nongnu.org; Thu, 19 Nov 2020 03:45:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kffZ9-0002Qr-0B for qemu-devel@nongnu.org; Thu, 19 Nov 2020 03:45:20 -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-191-IpPhHSihNhqCrmzYcpokDg-1; Thu, 19 Nov 2020 03:44:56 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6562018A226E for ; Thu, 19 Nov 2020 08:44:55 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-65.ams2.redhat.com [10.36.112.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BEF15D6A8; Thu, 19 Nov 2020 08:44:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1E7D2A1FB; Thu, 19 Nov 2020 09:44:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605775517; 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=XcBuP2kU2fxwlpdRUgR9Hp38wxCt6wO/FcLbo2CAgZM=; b=gg9MZn6ZAdtggaV4HM6a9djohnNaQhrEYvhzX+e9ZJYFJPkWPbdB50J7/K7EUJdWfPNhJN mq9wz9dtzXM0HkJCkmbEkHoc5mEOXYZ6JtDgnDbMmXMzfhVsY3IYb2w6tm05laD/UUnHqY ey+uc2iYLlaLWEKpZPh7ebxt98xfkrE= X-MC-Unique: IpPhHSihNhqCrmzYcpokDg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 2/4] meson: move up hw subdir (specifically before trace subdir) Date: Thu, 19 Nov 2020 09:44:46 +0100 Message-Id: <20201119084448.24397-3-kraxel@redhat.com> In-Reply-To: <20201119084448.24397-1-kraxel@redhat.com> References: <20201119084448.24397-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@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=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/19 03:44:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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: Gerd Hoffmann , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Needed so trace/meson.build can see stuff done in hw/*/meson.build. Signed-off-by: Gerd Hoffmann --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 04bd9b57e401..41009b9685de 100644 --- a/meson.build +++ b/meson.build @@ -1456,6 +1456,8 @@ trace_events_subdirs +=3D [ 'util', ] =20 +subdir('hw') + subdir('contrib/libvhost-user') subdir('qapi') subdir('qobject') @@ -1543,7 +1545,6 @@ subdir('migration') subdir('monitor') subdir('net') subdir('replay') -subdir('hw') subdir('accel') subdir('plugins') subdir('bsd-user') --=20 2.27.0 From nobody Sat May 4 14:23:40 2024 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605775674; cv=none; d=zohomail.com; s=zohoarc; b=HlITj6/Sue+pVqyOHrPN5H7J1CeLleWAzsafU8C2n8qTSJ2+oV/2kifWnENoee0CDimLbBNjzRGcILQUta8eExdooMyddrfsvpuceW28wi4jNJPwc+L+deqW/iEWdEwU1uydk9SxJ4fpCha/wuBoKBq511GCIKCZ83bkf7TZzTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605775674; 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=d0/ZyzKoHkM0GrDigQojop4wBuTYX5XKw5t3VpHtYcs=; b=hAuSHZb4T77ehWAu+1/luuV43e3hxcEnh1yPpBtU6NdjoCHFaltRgBNUBkZ3ywWX9v9fRHbYS2HzmtmOlPFOpRZb2Kzcv7h4t6jSNhajc1gQFw+iFMxS3yrPagY8bOLJI1btvxXGEG59C/bbEcF5zLHo77NNSvxODJsGOrutzt8= 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=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 1605775674514863.4217971525935; Thu, 19 Nov 2020 00:47:54 -0800 (PST) Received: from localhost ([::1]:58864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kffbd-00086M-CR for importer@patchew.org; Thu, 19 Nov 2020 03:47:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kffYu-0005cY-6N for qemu-devel@nongnu.org; Thu, 19 Nov 2020 03:45:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:35474) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kffYq-0002Ju-Go for qemu-devel@nongnu.org; Thu, 19 Nov 2020 03:45:03 -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-472-2peHVSroPVa-K_ZRPq6Xng-1; Thu, 19 Nov 2020 03:44:56 -0500 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 EF55A64161 for ; Thu, 19 Nov 2020 08:44:55 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-65.ams2.redhat.com [10.36.112.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B9CA60636; Thu, 19 Nov 2020 08:44:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2DFED9D92; Thu, 19 Nov 2020 09:44:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605775499; 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=d0/ZyzKoHkM0GrDigQojop4wBuTYX5XKw5t3VpHtYcs=; b=bgpkEKYfwcSDDrCubogODeZssgWQgdhQsVtVc8JE1yAlvsL+/KhbV2H1TGiuU7IFDm7LDt KiO3tIvOct8qw+6J552H0Ihp8haqy52wPNlfDC9gk0zFu+8u6bvtDS0OyOd+z7H8exAed0 N4wWi27iR+nN63RNLHSvyzadR7RxoNE= X-MC-Unique: 2peHVSroPVa-K_ZRPq6Xng-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 3/4] meson: move qxl trace events to separate file Date: Thu, 19 Nov 2020 09:44:47 +0100 Message-Id: <20201119084448.24397-4-kraxel@redhat.com> In-Reply-To: <20201119084448.24397-1-kraxel@redhat.com> References: <20201119084448.24397-1-kraxel@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=kraxel@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=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 23:36:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H4=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: Gerd Hoffmann , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Move qxl trace events to separate trace-events-qxl file. Signed-off-by: Gerd Hoffmann --- hw/display/qxl-render.c | 1 + hw/display/qxl.c | 1 + hw/display/meson.build | 4 +++ hw/display/trace-events | 67 ------------------------------------- hw/display/trace-events-qxl | 66 ++++++++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+), 67 deletions(-) create mode 100644 hw/display/trace-events-qxl diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c index 3ce2e57b8feb..cc4862e26eb6 100644 --- a/hw/display/qxl-render.c +++ b/hw/display/qxl-render.c @@ -23,6 +23,7 @@ #include "qxl.h" #include "sysemu/runstate.h" #include "trace.h" +#include "trace/trace-hw_display_qxl.h" =20 static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect) { diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 431c1070967a..4e8d1bb8d77b 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -33,6 +33,7 @@ #include "migration/blocker.h" #include "migration/vmstate.h" #include "trace.h" +#include "trace/trace-hw_display_qxl.h" =20 #include "qxl.h" =20 diff --git a/hw/display/meson.build b/hw/display/meson.build index dad3bd2b414b..c2fc36e19d3e 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -43,6 +43,10 @@ if config_all_devices.has_key('CONFIG_QXL') qxl_ss =3D ss.source_set() qxl_ss.add(when: 'CONFIG_QXL', if_true: [files('qxl.c', 'qxl-logger.c', = 'qxl-render.c'), pixman, spice]) + trace_events_config +=3D { + 'file' : meson.source_root() / 'hw' / 'display' / 'trace-events-qxl', + 'group' : 'hw_display_qxl', + } hw_display_modules +=3D {'qxl': qxl_ss} endif =20 diff --git a/hw/display/trace-events b/hw/display/trace-events index 957b8ba99436..48636149e4b2 100644 --- a/hw/display/trace-events +++ b/hw/display/trace-events @@ -58,73 +58,6 @@ virtio_gpu_update_cursor(uint32_t scanout, uint32_t x, u= int32_t y, const char *t virtio_gpu_fence_ctrl(uint64_t fence, uint32_t type) "fence 0x%" PRIx64 ",= type 0x%x" virtio_gpu_fence_resp(uint64_t fence) "fence 0x%" PRIx64 =20 -# qxl.c -disable qxl_interface_set_mm_time(int qid, uint32_t mm_time) "%d %d" -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_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" -qxl_enter_vga_mode(int qid) "%d" -qxl_exit_vga_mode(int qid) "%d" -qxl_hard_reset(int qid, int64_t loadvm) "%d loadvm=3D%"PRId64 -qxl_interface_async_complete_io(int qid, uint32_t current_async, void *coo= kie) "%d current=3D%d cookie=3D%p" -qxl_interface_attach_worker(int qid) "%d" -qxl_interface_get_init_info(int qid) "%d" -qxl_interface_set_compression_level(int qid, int64_t level) "%d %"PRId64 -qxl_interface_update_area_complete(int qid, uint32_t surface_id, uint32_t = dirty_left, uint32_t dirty_right, uint32_t dirty_top, uint32_t dirty_bottom= ) "%d surface=3D%d [%d,%d,%d,%d]" -qxl_interface_update_area_complete_rest(int qid, uint32_t num_updated_rect= s) "%d #=3D%d" -qxl_interface_update_area_complete_overflow(int qid, int max) "%d max=3D%d" -qxl_interface_update_area_complete_schedule_bh(int qid, uint32_t num_dirty= ) "%d #dirty=3D%d" -qxl_io_destroy_primary_ignored(int qid, const char *mode) "%d %s" -qxl_io_log(int qid, const char *log_buf) "%d %s" -qxl_io_read_unexpected(int qid) "%d" -qxl_io_unexpected_vga_mode(int qid, uint64_t addr, uint64_t val, const cha= r *desc) "%d 0x%"PRIx64"=3D%"PRIu64" (%s)" -qxl_io_write(int qid, const char *mode, uint64_t addr, const char *aname, = uint64_t val, unsigned size, int async) "%d %s addr=3D%"PRIu64 " (%s) val= =3D%"PRIu64" size=3D%u async=3D%d" -qxl_memslot_add_guest(int qid, uint32_t slot_id, uint64_t guest_start, uin= t64_t guest_end) "%d %u: guest phys 0x%"PRIx64 " - 0x%" PRIx64 -qxl_post_load(int qid, const char *mode) "%d %s" -qxl_pre_load(int qid) "%d" -qxl_pre_save(int qid) "%d" -qxl_reset_surfaces(int qid) "%d" -qxl_ring_command_check(int qid, const char *mode) "%d %s" -qxl_ring_command_get(int qid, const char *mode) "%d %s" -qxl_ring_command_req_notification(int qid) "%d" -qxl_ring_cursor_check(int qid, const char *mode) "%d %s" -qxl_ring_cursor_get(int qid, const char *mode) "%d %s" -qxl_ring_cursor_req_notification(int qid) "%d" -qxl_ring_res_push(int qid, const char *mode, uint32_t surface_count, uint3= 2_t free_res, void *last_release, const char *notify) "%d %s s#=3D%d res#= =3D%d last=3D%p notify=3D%s" -qxl_ring_res_push_rest(int qid, uint32_t ring_has, uint32_t ring_size, uin= t32_t prod, uint32_t cons) "%d ring %d/%d [%d,%d]" -qxl_ring_res_put(int qid, uint32_t free_res) "%d #res=3D%d" -qxl_set_mode(int qid, int modenr, uint32_t x_res, uint32_t y_res, uint32_t= bits, uint64_t devmem) "%d mode=3D%d [ x=3D%d y=3D%d @ bpp=3D%d devmem=3D0= x%" PRIx64 " ]" -qxl_soft_reset(int qid) "%d" -qxl_spice_destroy_surfaces_complete(int qid) "%d" -qxl_spice_destroy_surfaces(int qid, int async) "%d async=3D%d" -qxl_spice_destroy_surface_wait_complete(int qid, uint32_t id) "%d sid=3D%d" -qxl_spice_destroy_surface_wait(int qid, uint32_t id, int async) "%d sid=3D= %d async=3D%d" -qxl_spice_flush_surfaces_async(int qid, uint32_t surface_count, uint32_t n= um_free_res) "%d s#=3D%d, res#=3D%d" -qxl_spice_monitors_config(int qid) "%d" -qxl_spice_loadvm_commands(int qid, void *ext, uint32_t count) "%d ext=3D%p= count=3D%d" -qxl_spice_oom(int qid) "%d" -qxl_spice_reset_cursor(int qid) "%d" -qxl_spice_reset_image_cache(int qid) "%d" -qxl_spice_reset_memslots(int qid) "%d" -qxl_spice_update_area(int qid, uint32_t surface_id, uint32_t left, uint32_= t right, uint32_t top, uint32_t bottom) "%d sid=3D%d [%d,%d,%d,%d]" -qxl_spice_update_area_rest(int qid, uint32_t num_dirty_rects, uint32_t cle= ar_dirty_region) "%d #d=3D%d clear=3D%d" -qxl_surfaces_dirty(int qid, uint64_t offset, uint64_t size) "%d offset=3D0= x%"PRIx64" size=3D0x%"PRIx64 -qxl_send_events(int qid, uint32_t events) "%d %d" -qxl_send_events_vm_stopped(int qid, uint32_t events) "%d %d" -qxl_set_guest_bug(int qid) "%d" -qxl_interrupt_client_monitors_config(int qid, int num_heads, void *heads) = "%d %d %p" -qxl_client_monitors_config_unsupported_by_guest(int qid, uint32_t int_mask= , void *client_monitors_config) "%d 0x%X %p" -qxl_client_monitors_config_unsupported_by_device(int qid, int revision) "%= d revision=3D%d" -qxl_client_monitors_config_capped(int qid, int requested, int limit) "%d %= d %d" -qxl_client_monitors_config_crc(int qid, unsigned size, uint32_t crc32) "%d= %u %u" -qxl_set_client_capabilities_unsupported_by_revision(int qid, int revision)= "%d revision=3D%d" - -# qxl-render.c -qxl_render_blit(int32_t stride, int32_t left, int32_t right, int32_t top, = int32_t bottom) "stride=3D%d [%d, %d, %d, %d]" -qxl_render_guest_primary_resized(int32_t width, int32_t height, int32_t st= ride, int32_t bytes_pp, int32_t bits_pp) "%dx%d, stride %d, bpp %d, depth %= d" -qxl_render_update_area_done(void *cookie) "%p" - # vga.c vga_std_read_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x" vga_std_write_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x" diff --git a/hw/display/trace-events-qxl b/hw/display/trace-events-qxl new file mode 100644 index 000000000000..1146bd1640d2 --- /dev/null +++ b/hw/display/trace-events-qxl @@ -0,0 +1,66 @@ +# qxl.c +disable qxl_interface_set_mm_time(int qid, uint32_t mm_time) "%d %d" +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_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" +qxl_enter_vga_mode(int qid) "%d" +qxl_exit_vga_mode(int qid) "%d" +qxl_hard_reset(int qid, int64_t loadvm) "%d loadvm=3D%"PRId64 +qxl_interface_async_complete_io(int qid, uint32_t current_async, void *coo= kie) "%d current=3D%d cookie=3D%p" +qxl_interface_attach_worker(int qid) "%d" +qxl_interface_get_init_info(int qid) "%d" +qxl_interface_set_compression_level(int qid, int64_t level) "%d %"PRId64 +qxl_interface_update_area_complete(int qid, uint32_t surface_id, uint32_t = dirty_left, uint32_t dirty_right, uint32_t dirty_top, uint32_t dirty_bottom= ) "%d surface=3D%d [%d,%d,%d,%d]" +qxl_interface_update_area_complete_rest(int qid, uint32_t num_updated_rect= s) "%d #=3D%d" +qxl_interface_update_area_complete_overflow(int qid, int max) "%d max=3D%d" +qxl_interface_update_area_complete_schedule_bh(int qid, uint32_t num_dirty= ) "%d #dirty=3D%d" +qxl_io_destroy_primary_ignored(int qid, const char *mode) "%d %s" +qxl_io_log(int qid, const char *log_buf) "%d %s" +qxl_io_read_unexpected(int qid) "%d" +qxl_io_unexpected_vga_mode(int qid, uint64_t addr, uint64_t val, const cha= r *desc) "%d 0x%"PRIx64"=3D%"PRIu64" (%s)" +qxl_io_write(int qid, const char *mode, uint64_t addr, const char *aname, = uint64_t val, unsigned size, int async) "%d %s addr=3D%"PRIu64 " (%s) val= =3D%"PRIu64" size=3D%u async=3D%d" +qxl_memslot_add_guest(int qid, uint32_t slot_id, uint64_t guest_start, uin= t64_t guest_end) "%d %u: guest phys 0x%"PRIx64 " - 0x%" PRIx64 +qxl_post_load(int qid, const char *mode) "%d %s" +qxl_pre_load(int qid) "%d" +qxl_pre_save(int qid) "%d" +qxl_reset_surfaces(int qid) "%d" +qxl_ring_command_check(int qid, const char *mode) "%d %s" +qxl_ring_command_get(int qid, const char *mode) "%d %s" +qxl_ring_command_req_notification(int qid) "%d" +qxl_ring_cursor_check(int qid, const char *mode) "%d %s" +qxl_ring_cursor_get(int qid, const char *mode) "%d %s" +qxl_ring_cursor_req_notification(int qid) "%d" +qxl_ring_res_push(int qid, const char *mode, uint32_t surface_count, uint3= 2_t free_res, void *last_release, const char *notify) "%d %s s#=3D%d res#= =3D%d last=3D%p notify=3D%s" +qxl_ring_res_push_rest(int qid, uint32_t ring_has, uint32_t ring_size, uin= t32_t prod, uint32_t cons) "%d ring %d/%d [%d,%d]" +qxl_ring_res_put(int qid, uint32_t free_res) "%d #res=3D%d" +qxl_set_mode(int qid, int modenr, uint32_t x_res, uint32_t y_res, uint32_t= bits, uint64_t devmem) "%d mode=3D%d [ x=3D%d y=3D%d @ bpp=3D%d devmem=3D0= x%" PRIx64 " ]" +qxl_soft_reset(int qid) "%d" +qxl_spice_destroy_surfaces_complete(int qid) "%d" +qxl_spice_destroy_surfaces(int qid, int async) "%d async=3D%d" +qxl_spice_destroy_surface_wait_complete(int qid, uint32_t id) "%d sid=3D%d" +qxl_spice_destroy_surface_wait(int qid, uint32_t id, int async) "%d sid=3D= %d async=3D%d" +qxl_spice_flush_surfaces_async(int qid, uint32_t surface_count, uint32_t n= um_free_res) "%d s#=3D%d, res#=3D%d" +qxl_spice_monitors_config(int qid) "%d" +qxl_spice_loadvm_commands(int qid, void *ext, uint32_t count) "%d ext=3D%p= count=3D%d" +qxl_spice_oom(int qid) "%d" +qxl_spice_reset_cursor(int qid) "%d" +qxl_spice_reset_image_cache(int qid) "%d" +qxl_spice_reset_memslots(int qid) "%d" +qxl_spice_update_area(int qid, uint32_t surface_id, uint32_t left, uint32_= t right, uint32_t top, uint32_t bottom) "%d sid=3D%d [%d,%d,%d,%d]" +qxl_spice_update_area_rest(int qid, uint32_t num_dirty_rects, uint32_t cle= ar_dirty_region) "%d #d=3D%d clear=3D%d" +qxl_surfaces_dirty(int qid, uint64_t offset, uint64_t size) "%d offset=3D0= x%"PRIx64" size=3D0x%"PRIx64 +qxl_send_events(int qid, uint32_t events) "%d %d" +qxl_send_events_vm_stopped(int qid, uint32_t events) "%d %d" +qxl_set_guest_bug(int qid) "%d" +qxl_interrupt_client_monitors_config(int qid, int num_heads, void *heads) = "%d %d %p" +qxl_client_monitors_config_unsupported_by_guest(int qid, uint32_t int_mask= , void *client_monitors_config) "%d 0x%X %p" +qxl_client_monitors_config_unsupported_by_device(int qid, int revision) "%= d revision=3D%d" +qxl_client_monitors_config_capped(int qid, int requested, int limit) "%d %= d %d" +qxl_client_monitors_config_crc(int qid, unsigned size, uint32_t crc32) "%d= %u %u" +qxl_set_client_capabilities_unsupported_by_revision(int qid, int revision)= "%d revision=3D%d" + +# qxl-render.c +qxl_render_blit(int32_t stride, int32_t left, int32_t right, int32_t top, = int32_t bottom) "stride=3D%d [%d, %d, %d, %d]" +qxl_render_guest_primary_resized(int32_t width, int32_t height, int32_t st= ride, int32_t bytes_pp, int32_t bits_pp) "%dx%d, stride %d, bpp %d, depth %= d" +qxl_render_update_area_done(void *cookie) "%p" --=20 2.27.0 From nobody Sat May 4 14:23:40 2024 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605775633; cv=none; d=zohomail.com; s=zohoarc; b=GCfQE9zfCjgN6tPaQubA3VdAl9FUKFTQEFsVgJYAz0rgGiTJY0P2mlV1cxJsg/VmAq9zzOO5ypTggYw/Oq9mb2C+RWa4Q1otQSlN/8QdX2uJHrRVPLuKI+/RtpNZRcGmElnVjTZPo2RF8MNb1d5BPBz3YsH53OCsfqLE1Z8geHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605775633; 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=bgm9/Wh2v6g9XHdSsnWHg1DIjBCmoO18JttBQTXYSUk=; b=BtTEvAaHvdhTRBHy8pWSs79MCn8VO0GwNGihuJzI5ojQakivGatKr9htjeyyjels2ZGHAIITi2MHjThyHOyve5CVBK8HpCyheAfgKHRDtBM4F8BVwYcpe4bSvpnWQsyjHdprz3YCeyf54umAPAbOn3OfDrB7T2n6c/rNF+1cycE= 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=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 16057756336771013.0440649842378; Thu, 19 Nov 2020 00:47:13 -0800 (PST) Received: from localhost ([::1]:57150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kffay-0007Nf-7f for importer@patchew.org; Thu, 19 Nov 2020 03:47:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kffYs-0005b8-Py for qemu-devel@nongnu.org; Thu, 19 Nov 2020 03:45:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kffYq-0002J5-Fe for qemu-devel@nongnu.org; Thu, 19 Nov 2020 03:45:02 -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-189-lXixgMxjNA6usX8O4B7eZA-1; Thu, 19 Nov 2020 03:44:55 -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 E72E61074667 for ; Thu, 19 Nov 2020 08:44:54 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-65.ams2.redhat.com [10.36.112.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BA3419728; Thu, 19 Nov 2020 08:44:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 383C09D99; Thu, 19 Nov 2020 09:44:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605775498; 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=bgm9/Wh2v6g9XHdSsnWHg1DIjBCmoO18JttBQTXYSUk=; b=Iq5f5SYdWTj+3mi1m45DwdL4nhKk5qjSFMereisI58vI/sEARVCsn8yBgscQ8N+SO9bJyz Fpu4KnlEUdvWHelsHGYV7UXwZMU4ZemWbJSALxFhoHSlbdXYgSfztvxioiK88fOKDocbCJ 8b2O2GRqMF7S7yGCrUrrqCKkQaVUPyc= X-MC-Unique: lXixgMxjNA6usX8O4B7eZA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 4/4] [broken] meson: try link tracepoints to module Date: Thu, 19 Nov 2020 09:44:48 +0100 Message-Id: <20201119084448.24397-5-kraxel@redhat.com> In-Reply-To: <20201119084448.24397-1-kraxel@redhat.com> References: <20201119084448.24397-1-kraxel@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=kraxel@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=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/19 03:44:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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: Gerd Hoffmann , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Add source set to trace_events_config, use it in trace/meson.build so the trace objects are linked to the module not core qemu. Not working as intended. /me looks puzzled. Signed-off-by: Gerd Hoffmann --- hw/display/meson.build | 1 + trace/meson.build | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/display/meson.build b/hw/display/meson.build index c2fc36e19d3e..94e355ac1e81 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -46,6 +46,7 @@ if config_all_devices.has_key('CONFIG_QXL') trace_events_config +=3D { 'file' : meson.source_root() / 'hw' / 'display' / 'trace-events-qxl', 'group' : 'hw_display_qxl', + 'ss' : qxl_ss, } hw_display_modules +=3D {'qxl': qxl_ss} endif diff --git a/trace/meson.build b/trace/meson.build index 66395d3e2ba7..3f0fe7b7b74c 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -18,6 +18,7 @@ foreach c : trace_events_config trace_events_files +=3D [ trace_events_file ] group =3D '--group=3D' + c.get('group') fmt =3D '@0@-' + c.get('group') + '.@1@' + module_ss =3D c.get('ss', trace_ss) =20 trace_h =3D custom_target(fmt.format('trace', 'h'), output: fmt.format('trace', 'h'), @@ -36,10 +37,10 @@ foreach c : trace_events_config input: trace_events_file, command: [ tracetool, group, '--format=3Du= st-events-h', '@INPUT@' ], capture: true) - trace_ss.add(trace_ust_h, lttng, urcubp) + module_ss.add(trace_ust_h, lttng, urcubp) genh +=3D trace_ust_h endif - trace_ss.add(trace_h, trace_c) + module_ss.add(trace_h, trace_c) if 'CONFIG_TRACE_DTRACE' in config_host trace_dtrace =3D custom_target(fmt.format('trace-dtrace', 'dtrace'), output: fmt.format('trace-dtrace', 'dtrac= e'), @@ -50,13 +51,13 @@ foreach c : trace_events_config output: fmt.format('trace-dtrace', 'h'), input: trace_dtrace, command: [ 'dtrace', '-o', '@OUTPUT@', = '-h', '-s', '@INPUT@' ]) - trace_ss.add(trace_dtrace_h) + module_ss.add(trace_dtrace_h) if host_machine.system() !=3D 'darwin' trace_dtrace_o =3D custom_target(fmt.format('trace-dtrace', 'o'), output: fmt.format('trace-dtrace', 'o= '), input: trace_dtrace, command: [ 'dtrace', '-o', '@OUTPUT@'= , '-G', '-s', '@INPUT@' ]) - trace_ss.add(trace_dtrace_o) + module_ss.add(trace_dtrace_o) endif =20 genh +=3D trace_dtrace_h --=20 2.27.0