From nobody Mon Feb 9 11:30:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611348322; cv=none; d=zohomail.com; s=zohoarc; b=cyNIiHRV/2bV8QF7tCR9SVlnmrFtYZRhOsND65goJkpSIyev7H1G2Vxd6tsJL6egFWxPoiRQD4kSzVNDJTerx+FIzYaUOl8CiOgCCImrYEzlK4iC0zPeH3cK+7yptnhHIlA5TR7LjRt9Yb4M7xTDJYZMz4+Ga0zhivyJ+N2vgsU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611348322; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=yHJ2XuVci3FGNiQY5SlEo5RMP1UZeE27p+2I+95wtjY=; b=CXS5R2jLKyEHz/jl/W0HEp2Y3v7pwAW/bAdlVIPrMtowb8ifQba10dGbtotL4xBq05rEUm1jvYvpdpaM4V4Guz0B3cpZYod26Xg/i6nWjVIpHWxHtYZkGP61Fe/gEDii6P1IppgW6b6fN6MErAYrCL85dNjftNmEpKYbgeNBOH8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611348322139824.9877190226163; Fri, 22 Jan 2021 12:45:22 -0800 (PST) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-205-p495Bh0fM2KEcoFkdoa99A-1; Fri, 22 Jan 2021 15:45:18 -0500 Received: by mail-ej1-f72.google.com with SMTP id h4so2694274eja.12 for ; Fri, 22 Jan 2021 12:45:18 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id k6sm5171423ejb.84.2021.01.22.12.45.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:45:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611348321; 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=yHJ2XuVci3FGNiQY5SlEo5RMP1UZeE27p+2I+95wtjY=; b=FNN/NmbDxq9VDLkhB/XvkOw3NoRpANT47yxB6OtxCwfrWd8Tg8Fe8p1UAYNFZX8nruVUA/ geQjQ2+zN/6CV4lebA7swVKDRvtQO+q+i71vfsZFleKnWnzA12zNa5jVmXUouC5qDAO9d8 0YzFvtl7oPfBy2I9oDDlAipcshyxsOI= X-MC-Unique: p495Bh0fM2KEcoFkdoa99A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yHJ2XuVci3FGNiQY5SlEo5RMP1UZeE27p+2I+95wtjY=; b=Zij/Ln+avhfhCdMzQ/7G2VCvSgHjaPYh4mFmePRMyz8MwoiLD2d7m6MWjHivmKb9mF hioXYh9L1lPr7nWEpsQnANhhYg8j2Kckc/HuiWo5Wv97EyrDMEfMzmAB9K+opnBAkLlT NMOcKLM+OB6MOUsPp4TrNMB8zz+c8w6parpFUuVIuhWQdDv0ms040qZlUdpEbLO5RT7Y 3kqQEbY/+DdEnTBfO77qYVidNJLapxMu8ndCIrtcicJR8cf+igH0IAYyd5xCyUydbapt UN2aVlZzNRXNY/1A2LxdEvY3yd4Goj+b+5a/E1mompfmFedeb6i4WIM+sWYT/2HrBqEC uCyA== X-Gm-Message-State: AOAM531mf+AGmTzdGvwYCuWMt/+X1xtPC3RfkwrKy33pzjSo/dhQjaiC GVN4FKNpjlWiYDQFJRX7cStM6040y+fvQ30BvI0y3lkfiwjOzf9H4TdmFLBjxJ0/07cd++MEahR pFw+1+EssVlJ0QA== X-Received: by 2002:a17:906:97c5:: with SMTP id ef5mr51922ejb.347.1611348317082; Fri, 22 Jan 2021 12:45:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzH6IHk7jyHHQV3mNKNbE3OWPCYK0fV1QLoAClzW6rGtGMJMa1BylO9Gdb/NxojsBx+twpZTg== X-Received: by 2002:a17:906:97c5:: with SMTP id ef5mr51907ejb.347.1611348316970; Fri, 22 Jan 2021 12:45:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , Michael Roth , Claudio Fontana , Thomas Huth , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi Subject: [PATCH v2 06/12] meson: Merge trace_events_subdirs array Date: Fri, 22 Jan 2021 21:44:35 +0100 Message-Id: <20210122204441.2145197-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122204441.2145197-1-philmd@redhat.com> References: <20210122204441.2145197-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The trace_events_subdirs array is split in two different locations, merge it as one. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Claudio Fontana --- Cc: Stefan Hajnoczi --- meson.build | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index 181f8795f5a..c43538a1523 100644 --- a/meson.build +++ b/meson.build @@ -1686,7 +1686,20 @@ '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 +=3D [ 'linux-user' ] @@ -1759,21 +1772,6 @@ 'ui', ] endif -trace_events_subdirs +=3D [ - 'hw/core', - 'qapi', - 'qom', - 'target/arm', - 'target/hppa', - 'target/i386', - 'target/i386/kvm', - 'target/mips', - 'target/ppc', - 'target/riscv', - 'target/s390x', - 'target/sparc', - 'util', -] =20 vhost_user =3D not_found if 'CONFIG_VHOST_USER' in config_host --=20 2.26.2