From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4ACABC00454 for ; Thu, 12 Dec 2019 13:01:04 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1A4BE2077B for ; Thu, 12 Dec 2019 13:01:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="oMxFN5Do" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A4BE2077B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO5W-0003Tw-Am for qemu-devel@archiver.kernel.org; Thu, 12 Dec 2019 08:01:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56857) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxv-0002me-5L for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxt-0005pn-Hr for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:10 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:51698) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxt-0005nv-AT for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:09 -0500 Received: by mail-wm1-x32f.google.com with SMTP id d73so2250531wmd.1 for ; Thu, 12 Dec 2019 04:53:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ROYx5+0XLUpLftchu3ejkBE7YKh7Fs75vJaZPNs0XI4=; b=oMxFN5DoGuNkWSwudV9KnJ/a+q8SevyKjZeLYlj7iSxDf/f73te09SjnGi4L7+i0hn T+nfqIELd3Zh3GWbvVKVllVUaRITTAbA55LxXKl1NgpSWjyhQXToT4V8LWv9brEWIkZ3 oQglKGAqPLIf71zVjlRzvuyXo4/052w1rmxh61moRXntkLnKil7eHesM3J0tG5hndPEe q1Rfv0E7/gd9Pm7HOE4U87T5MNbOwwtpRfQCpdEqyq2PhZ0zknsfDuRrklltxCvSiOxs I3EdGaK0RAYFlGXaLnSwGTb3iYYQK/8VHkUQGfjazMQ1yG+zln4uJy+7q+wZeOJpSnqq C9VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ROYx5+0XLUpLftchu3ejkBE7YKh7Fs75vJaZPNs0XI4=; b=Sv7SBPDixxWLbOcerH/xmhGqbTyMbT287mpQA61kjf5+FSnrmSrZZjfJvboJF8ZuKg hDc2xATuUuB/itZ9ydXVbjEU3b6VI/XlsJJzzrd3skyimoqiaDGP3TDvUxlGwJcvvQPd U+4XhTZKmzECmurqgo9Rc9OEQPWKUvpmpsCMs0s7vJmKaHtPjtbZ83/iCSKaxBjEtg1r VA5nB/hl7pRfMnHSJQJmOu6NAIY51AJ2TCPKK38+XS8Qa2Q0uDR1fQ5QGrk2fZHeCqCR w6T001+0I2jkeQI2MY7KEElzq572fzejJUktema/vBmoH1SZRtmQ3dxxipQlggMF+ZK2 Dx1Q== X-Gm-Message-State: APjAAAU7K2gU5ZFCTmLQ8Gco0IWhcfWgeQzo9NHi6n/S8hyNd2nOrxun kTkiVuMuEL3+daDmCx+p3FRprgT5 X-Google-Smtp-Source: APXvYqxmJBwFJ/1XxolnbCqUcsh9VIuwWgcva0iVFRiI8Z15DSTE2oWWNQn475HZvOMHeTs0FTdUtQ== X-Received: by 2002:a7b:c0d8:: with SMTP id s24mr6826855wmh.30.1576155187982; Thu, 12 Dec 2019 04:53:07 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:07 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 010/132] meson: add remaining generated tcg trace helpers Date: Thu, 12 Dec 2019 13:50:54 +0100 Message-Id: <1576155176-2464-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 51 --------------------------------------------------- trace/meson.build | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 51 deletions(-) diff --git a/Makefile b/Makefile index 6f97ae9..97f9ffd 100644 --- a/Makefile +++ b/Makefile @@ -112,61 +112,10 @@ FULL_VERSION := $(if $(QEMU_PKGVERSION),$(VERSION) ($(QEMU_PKGVERSION)),$(VERSIO generated-files-y = qemu-version.h config-host.h qemu-options.def -generated-files-y += trace/generated-tcg-tracers.h - -generated-files-y += trace/generated-helpers-wrappers.h -generated-files-y += trace/generated-helpers.h -generated-files-y += trace/generated-helpers.c - generated-files-y += module_block.h generated-files-y += .git-submodule-status -tracetool-y = $(SRC_PATH)/scripts/tracetool.py -tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py") - -trace/generated-helpers-wrappers.h: trace/generated-helpers-wrappers.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y) - @mkdir -p $(dir $@) - $(call quiet-command,$(TRACETOOL) \ - --group=root \ - --format=tcg-helper-wrapper-h \ - --backend=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - -trace/generated-helpers.h: trace/generated-helpers.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace/generated-helpers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y) - @mkdir -p $(dir $@) - $(call quiet-command,$(TRACETOOL) \ - --group=root \ - --format=tcg-helper-h \ - --backend=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - -trace/generated-helpers.c: trace/generated-helpers.c-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace/generated-helpers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y) - @mkdir -p $(dir $@) - $(call quiet-command,$(TRACETOOL) \ - --group=root \ - --format=tcg-helper-c \ - --backend=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - -trace/generated-helpers.o: trace/generated-helpers.c - -trace/generated-tcg-tracers.h: trace/generated-tcg-tracers.h-timestamp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y) - @mkdir -p $(dir $@) - $(call quiet-command,$(TRACETOOL) \ - --group=root \ - --format=tcg-h \ - --backend=$(TRACE_BACKENDS) \ - $< > $@,"GEN","$(patsubst %-timestamp,%,$@)") - KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv diff --git a/trace/meson.build b/trace/meson.build index d0e5d17..8ea8db7 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -61,6 +61,20 @@ custom_target('trace-events-all', install: true, install_dir: config_host['qemu_datadir']) +foreach d : [ + ['generated-tcg-tracers.h', 'tcg-h'], + ['generated-helpers.c', 'tcg-helper-c'], + ['generated-helpers.h', 'tcg-helper-h'], + ['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'], +] + custom_target(d[0], + output: d[0], + input: meson.source_root() / 'trace-events', + command: [ tracetool, '--group=root', '--format=@0@'.format(d[1]), '@INPUT@' ], + build_by_default: true, # to be removed when added to a target + capture: true) +endforeach + if 'CONFIG_TRACE_UST' in config_host trace_ust_all_h = custom_target('trace-ust-all.h', output: 'trace-ust-all.h', -- 1.8.3.1