From patchwork Mon Feb 8 18:23:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12076731 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 9FD7DC433E6 for ; Mon, 8 Feb 2021 23:10:49 +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 3B81264E27 for ; Mon, 8 Feb 2021 23:10:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B81264E27 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]:49408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Fg8-0001Oq-0D for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 18:10:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9BCd-0003WF-It for qemu-devel@nongnu.org; Mon, 08 Feb 2021 13:24:03 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:42029) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l9BCX-0006El-Oe for qemu-devel@nongnu.org; Mon, 08 Feb 2021 13:23:58 -0500 Received: by mail-wr1-x433.google.com with SMTP id r21so2150206wrr.9 for ; Mon, 08 Feb 2021 10:23:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BLWzLjUfsLqLzWMs+J77xBL5O0bPOMZrdfzCWZyojPE=; b=cvEcn73BcvDO44LSKAHov81EzuSKHnNe8WCKC1urwKltApGAbNKxhd/6/tYCBgaxGH w002uHfHJS2AAGiREghCAC+QAEzwhfR8izQ54xn0aAso8jwY6/CogfZ07gtzks3f3GWX OasW7tiqTzEaEnIq3yAEhDN7JcqPwR004ZaYEom3J6GjfaEQkGDY4A7CLBi/0n4GCsTI /Gdpk92g7SxUU/0RM8WQ9TNUye7STapHTkYB8F+D1n74NXn9Zl0dYB27EgmNqQfWwYnY AYtHERKmsIDPOe5DVJXlZSY7a1KSuxREOjIedtXY1eWxlyDLyQSlV7d1gt3mYldta1+j 6glA== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BLWzLjUfsLqLzWMs+J77xBL5O0bPOMZrdfzCWZyojPE=; b=S05VzLUxm9WGPSHSPMthpkdPBLIdsdXa3XcizH6EOTDUnoPdPYXQtRCfl4KIgNkvNO D/NMRZtQXJSPKR87qKkKh7EYYs4GR/VPnpZVTVIUznfT8FSfcw8xhJA0QHiXw+K4QfVK /kZNE67l5ORTS3BGG5n9aApi6ykCUwPRhclPC0KX3+Ilw9rVh8x2duX8SSiqnd2bCYvy k6Nl06bDzTCmK8LrMf0fItL8qqDHGr/h8bIvpNZGM8fRc86w2bRT0UzIVd+SAp339jjt VOcTSQF3CcG81f20o74YHA7FfB6eRXaSnr9+FgZPxouzMZWbIcztqEgINj3k5Vb3n2GK 6qFQ== X-Gm-Message-State: AOAM533pZpqkyvKR5ZHaN/2l1fRwaWolXDMeBBUrqKjlUjT+7Mc2hqTt X91Q1GUIBtC9EZIPL+EVhFh30QvvxBgleA== X-Google-Smtp-Source: ABdhPJxG3E7qxDDWdYi7TfPHSEDIaelrs+PEeRmCGBoKSk/Ez5sj0VkzYWJXEl0JPhND6JgBy208sg== X-Received: by 2002:a5d:640c:: with SMTP id z12mr21210233wru.342.1612808636548; Mon, 08 Feb 2021 10:23:56 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id x22sm19670wmc.25.2021.02.08.10.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 10:23:56 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 25/46] meson: Merge trace_events_subdirs array Date: Mon, 8 Feb 2021 19:23:10 +0100 Message-Id: <20210208182331.58897-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210208182331.58897-1-pbonzini@redhat.com> References: <20210208182331.58897-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Claudio Fontana Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The trace_events_subdirs array is split in two different locations, merge it as one. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Paolo Bonzini Reviewed-by: Claudio Fontana Message-Id: <20210122204441.2145197-7-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- meson.build | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index 0ca73d0102..da21812064 100644 --- a/meson.build +++ b/meson.build @@ -1744,7 +1744,20 @@ trace_events_subdirs = [ 'accel/kvm', 'accel/tcg', 'crypto', + 'hw/core', + 'qapi', + 'qom', 'monitor', + 'target/arm', + 'target/hppa', + 'target/i386', + 'target/i386/kvm', + 'target/mips', + 'target/ppc', + 'target/riscv', + 'target/s390x', + 'target/sparc', + 'util', ] if have_user trace_events_subdirs += [ 'linux-user' ] @@ -1817,21 +1830,6 @@ if have_system 'ui', ] endif -trace_events_subdirs += [ - 'hw/core', - 'qapi', - 'qom', - 'target/arm', - 'target/hppa', - 'target/i386', - 'target/i386/kvm', - 'target/mips', - 'target/ppc', - 'target/riscv', - 'target/s390x', - 'target/sparc', - 'util', -] vhost_user = not_found if 'CONFIG_VHOST_USER' in config_host