From patchwork Tue Nov 19 14:23:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 844269 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:8b:b0:382:43a8:7b94 with SMTP id m11csp1181426wrx; Tue, 19 Nov 2024 06:25:00 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWfSNSbgccPJm/KhxYUdn3e+sF97giAPVLIKyLxCj+9rcAWKb61eesZHPRXA6Of8gDu8QOIFw==@linaro.org X-Google-Smtp-Source: AGHT+IEZMAZi49LQGL/adKKWH2Wyr4zjZkT01NyObFBOr3DgfhpRiBnCsKeFQjNr7JnLIkqJHamk X-Received: by 2002:a05:622a:8c0a:b0:45f:890c:5f49 with SMTP id d75a77b69052e-46392db6ad1mr48533511cf.24.1732026300317; Tue, 19 Nov 2024 06:25:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1732026300; cv=none; d=google.com; s=arc-20240605; b=TIInk5mDPNpKGPJmakQCdMHHr4HwwpFk8amdTgufMMfjfhjA9tPALjsYuQe+uerN29 CnP9z35XVf1tOa1X+1O9Bsbde+0tyrdBXgzmOc90kOUem8R8P2JK1MwH0GgZMWH1y0Sg tVAJKqg3gzY0KVg3VWbCOva6TcV8RZOUwdY5VT7SyDisGB68Xpwo6JeoPqKNAZDmMEIK zpOZgQeVpI9AYKY346SdFrMm/ZrZRZ3S7e3Qtp7f2X0cG0w3KStys69Akx8cBvKLs/3t Zl+gd6HmGc4gPXB4QrzuV6rXtnPN5zRXbQ8+uKwM+pRCq184gjP5tVShGEhkcRBtyvzV xaLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=RzMX04CUUuh+Xk+AH/1AGddH04IQDU5JSslwP2URJ/o=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=lU7RUnSLVvTMw7wrifxcuRu348dK2M3WrYUTLbQ0+QAv9mi0o+VR+On/nOlUCg1sGm n0WHr9ryAGysy2KK8PDPDqavxJynRmdfdHTYv/s0AJkgvHgl4b0NzYp8bNUmWzjWPETu AJc6Ng9fOljdQQtMzqNUOX1P2Otnps1n0nKUbQ6giPWj/DcVaHLpkQ08A6Se/XZN6Vkc qYonykDc9tkk6Rs+NZNymHQ3RUCPHjcqE3lonkfvxh/0t90ll6yG0ctXuJtoebtao5im IpgGtzKgCLRH5wF4wqIONnX3lHbV1X9qO7vtOhJc9aCpLvTeh3zlOHG5mW9XgRGnjy+Y HWxA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qeYmDOEc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-46392c65330si21972111cf.626.2024.11.19.06.25.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Nov 2024 06:25:00 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qeYmDOEc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDP8k-0005xo-9P; Tue, 19 Nov 2024 09:23:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tDP8g-0005vb-Ks for qemu-devel@nongnu.org; Tue, 19 Nov 2024 09:23:34 -0500 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tDP8f-0006Ew-13 for qemu-devel@nongnu.org; Tue, 19 Nov 2024 09:23:34 -0500 Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2ff64e5d31bso10607191fa.0 for ; Tue, 19 Nov 2024 06:23:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732026211; x=1732631011; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=RzMX04CUUuh+Xk+AH/1AGddH04IQDU5JSslwP2URJ/o=; b=qeYmDOEc7ejATPqx8Z2uIolzsAaO8pwGap4GLwgqurxuxTbYpDyqWM2Es7+ZzSmYey TOQEeF/gwjVr7/WwJ0QSHjj6cHAevwFII52GzANWyUCefhaatu6DvW3Efjptcjnu95hT u8lbijgRIMvEegwNjSjaAUC3YL1gh11XQZbU7Lfhm3F6VAew5rAKH476B/08bM8GlJAV ju9nuf7JuBZqMMiFsGBBPVPrvPmPNXH1dwOA+6n6XkqqTl+v+CJfVjEz8iuZ3Z/D1lb2 ul4upaRzBMOLdX+jAekMdrt/OAxGbm7moIGKuJJGFr0fulmzqHn2IMYLy33F8q5ohZZK d4jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732026211; x=1732631011; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RzMX04CUUuh+Xk+AH/1AGddH04IQDU5JSslwP2URJ/o=; b=eJeI5XuyjfibFt4o006nFH6hGOEIZGhueuKu8k+9x7LQ6wg7i1+euS7gIT2DUSW3mc MjHsLBamml9qBjPtRjIJUjdsZ2PVAnferiOmuttbXEcbuPQzEdU03fZn/mNvc4CLQMr/ p8QQb9wtdNmjlHaionA4MKWy8XTOjq827h9OoA9LQEa27/vvUD2I7vri8OQIDYAu+OS3 7F7V4JUHGA/5l6cWXiLn/vVYtdCh1wH0M8Rjl9bOtYhPIPtrbyJ2SGEprDGE7h9H5/dD M2XIZI89J53A0A5XtiypRM+VVSEcIAAnWa+fYTQemaLP/Pq3DVSOvgXB8Xn5OMoTODSm Vc/g== X-Gm-Message-State: AOJu0YwjSVNS3RdYOML8nU2yFBtNI2nzvtnipTBYimwMSMW+WEo1YtAf VCpiCln5f+SBXn/0Xfs9lf3YKYqVF/Ci2gtWctYLOWu6XX5aMeumXwRQgGE3fFqQ3FKNgA+gwqs U X-Received: by 2002:a05:6512:2316:b0:53b:20a1:1c4a with SMTP id 2adb3069b0e04-53dab3b99c6mr6962141e87.42.1732026211081; Tue, 19 Nov 2024 06:23:31 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-432dac21a15sm193049985e9.38.2024.11.19.06.23.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2024 06:23:30 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 15/15] trace: Don't include trace-root.h in control.c or control-target.c Date: Tue, 19 Nov 2024 14:23:21 +0000 Message-Id: <20241119142321.1853732-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241119142321.1853732-1-peter.maydell@linaro.org> References: <20241119142321.1853732-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::233; envelope-from=peter.maydell@linaro.org; helo=mail-lj1-x233.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The trace-root.h file has the definitions of trace events for the top-level trace-events file (i.e. for those events which are used in source files in the root of the source tree). There's no particular need for trace/control.c or trace/control-target.c to include this. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-id: 20241108162909.4080314-4-peter.maydell@linaro.org --- trace/control-target.c | 1 - trace/control.c | 1 - 2 files changed, 2 deletions(-) diff --git a/trace/control-target.c b/trace/control-target.c index 97f21e476d2..d58e84f6dd8 100644 --- a/trace/control-target.c +++ b/trace/control-target.c @@ -10,7 +10,6 @@ #include "qemu/osdep.h" #include "qemu/lockable.h" #include "cpu.h" -#include "trace/trace-root.h" #include "trace/control.h" diff --git a/trace/control.c b/trace/control.c index ef107829ac0..1c8c50064af 100644 --- a/trace/control.c +++ b/trace/control.c @@ -27,7 +27,6 @@ #include "qemu/error-report.h" #include "qemu/config-file.h" #include "monitor/monitor.h" -#include "trace/trace-root.h" int trace_events_enabled_count;