From patchwork Wed May 26 23:46:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 448234 Delivered-To: patch@linaro.org Received: by 2002:a17:907:2b0d:0:0:0:0 with SMTP id gc13csp6044150ejc; Wed, 26 May 2021 16:49:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRiEFKhlGdd2fed48M54oDaTGgJ4r2UAtrEcECXmFb02fnWD0gMo1UfujVxnDBhaLTpPd4 X-Received: by 2002:a05:620a:2e4:: with SMTP id a4mr690502qko.250.1622072962830; Wed, 26 May 2021 16:49:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622072962; cv=none; d=google.com; s=arc-20160816; b=maACVI0XZ6LoY99jhVybiEY2n/ssNfBD+oCLafwd89NFlXIeAZnFgvCcYy+w6rILCO ire5knEKmLIGA4ETvk39ilv4a2nonYOC2IeSDLxqaaUJRsKVGJ/rxAR+LahF7JQgvnFq IntxlT6qADnPDRTZJLw9E0SqQSplwXIlS5u0Dzx6lWPgV09wsrQ1RdkMlbBsev0MfnwM ntcwDuPkyOcZCTctI19LGvLnk9HikB/buG2IycUyRqRyhVGZ7fyCf8LSMT7R3IKNiyYE w4d+xlq3B1lvnQ/SeMWyUGRBgYNQJIR1p1Qb1501g9jXFhgfpef13rrsbsZUnicTrIgH apHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=NKrR+Y1HHSCDluHdieEW79BiIBCD6gCzbNQyl4SjDwo=; b=LOmhu6oymRMJ3RJEpS/EGdhe18CF7uc4TxfPWAigdv29jE7BdvA1jbZZGzM1pI6sUJ csJdm+trKqN/3PCeUQdPUU9dAXvkhaeUqVaxgA62Phy2UXbaAW+wE0pD0siGJySfIGyw usATBgyCOncsrXwzSv/DVVa9/cqjveARa7A1f5ybnsoDjhrpdHoxiNWkcZOT2N92p48B ztGjN/RxsK44xIGvgyJOjMImnx4NxE0IECPTucNOsLYHIQ+xbxeZ9G+GegmuhBs+m2xG 5AqjMX+phzWbvUdRC7SR6yAMwkcPve+g6rfAJtixFNVrb2SNUQdk1B2Mda7e7OQYZkob 135g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pPkVqmsY; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q2si451210qtn.298.2021.05.26.16.49.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 May 2021 16:49:22 -0700 (PDT) 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=pPkVqmsY; 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 Received: from localhost ([::1]:56054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lm3H8-0005uC-3V for patch@linaro.org; Wed, 26 May 2021 19:49:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lm3FN-0005gH-1H for qemu-devel@nongnu.org; Wed, 26 May 2021 19:47:33 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:38815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lm3FB-0004To-MJ for qemu-devel@nongnu.org; Wed, 26 May 2021 19:47:32 -0400 Received: by mail-pg1-x531.google.com with SMTP id 6so2296282pgk.5 for ; Wed, 26 May 2021 16:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NKrR+Y1HHSCDluHdieEW79BiIBCD6gCzbNQyl4SjDwo=; b=pPkVqmsYA/T5h4tjidjw8D5DDXKdQGPUiDcVfPV+/UPFIBOS1nYDuJvFquAbZ+q6Dh s3SvVonUhR6lzc2WyVk6GFQEEq+wnDjdacLajx1wv52G1aOkb+khcriPwhjuw3tWiHl7 i1ElN47eoANZYm04hkulvI/3/+Tg12yHrWQohiWTzpMAs6XCnZc5CAO5DmXShpxw0wGC T48MMSVgv2rCi/8We7PGSbs2ftcJll/lySLaJrYTFGUB2abSrQLMJzefXuLZfv1gtGf8 8AbGHlthThYRNSfnGH7HMIEm/RFjglwJNZurFCk8mIR+Lsw7oUZC5jqCOBBIkygbgVrE 0plA== 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=NKrR+Y1HHSCDluHdieEW79BiIBCD6gCzbNQyl4SjDwo=; b=gJNFxnELHiShfAXL77appI2ERuEwQsPp91epWRCs8D6YjxO0uPjCVSTKdbfajwSLqT ub7lPBmnC/Qdz7zUUwYizJEA9fwvnMqTYesJ6kybVINIbyoBw/agoouRfhQLVP8oXLVO 32QIQe9eplwYc+3T82lbGZh0UoXeFtDxwrxDUIO7GXS3lcx8hb4ncwuPcMnzLoW64eXR VqpT1PLpg6//vuw2X/noRpiEbS+M0zWt8/FnMcMWNUhiutel+jL5FueRbqCLntvIAcAN gQGX2j4ybIESII4XGiFZfE53HL1Z0nVy/jY4vlBz9PDTxgvxtTGyaqMHHl4AOd8hL9ZM hrBQ== X-Gm-Message-State: AOAM530S65ZJLHvSRX4qyw9TbFF8s3kZjtV8H5idljofffh6WLNWU8T1 gFnpQUovnNCo0kjNgSmXPo37m9khldzruA== X-Received: by 2002:a62:30c2:0:b029:289:116c:ec81 with SMTP id w185-20020a6230c20000b0290289116cec81mr960600pfw.42.1622072838487; Wed, 26 May 2021 16:47:18 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id g13sm285355pfi.18.2021.05.26.16.47.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 16:47:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 07/31] accel/tcg: Reduce 'exec/tb-context.h' inclusion Date: Wed, 26 May 2021 16:46:46 -0700 Message-Id: <20210526234710.125396-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210526234710.125396-1-richard.henderson@linaro.org> References: <20210526234710.125396-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x531.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Only 2 headers require "exec/tb-context.h". Instead of having all files including "exec/exec-all.h" also including it, directly include it where it is required: - accel/tcg/cpu-exec.c - accel/tcg/translate-all.c For plugins/plugin.h, we were implicitly relying on exec/exec-all.h -> exec/tb-context.h -> qemu/qht.h which is now included directly. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210524170453.3791436-2-f4bug@amsat.org> [rth: Fix plugins/plugin.h compilation] Signed-off-by: Richard Henderson --- include/exec/exec-all.h | 1 - include/tcg/tcg.h | 1 - plugins/plugin.h | 1 + accel/tcg/cpu-exec.c | 1 + accel/tcg/translate-all.c | 1 + 5 files changed, 3 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 8021adf38f..754f4130c9 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -21,7 +21,6 @@ #define EXEC_ALL_H #include "cpu.h" -#include "exec/tb-context.h" #ifdef CONFIG_TCG #include "exec/cpu_ldst.h" #endif diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 0f0695e90d..74cb345308 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -27,7 +27,6 @@ #include "cpu.h" #include "exec/memop.h" -#include "exec/tb-context.h" #include "qemu/bitops.h" #include "qemu/plugin.h" #include "qemu/queue.h" diff --git a/plugins/plugin.h b/plugins/plugin.h index 1aa29dcadd..55017e3581 100644 --- a/plugins/plugin.h +++ b/plugins/plugin.h @@ -13,6 +13,7 @@ #define _PLUGIN_INTERNAL_H_ #include +#include "qemu/qht.h" #define QEMU_PLUGIN_MIN_VERSION 0 diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 0dc5271715..10e11f27bb 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -31,6 +31,7 @@ #include "qemu/rcu.h" #include "exec/tb-hash.h" #include "exec/tb-lookup.h" +#include "exec/tb-context.h" #include "exec/log.h" #include "qemu/main-loop.h" #if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 640ff6e3e7..e9f4de5190 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -48,6 +48,7 @@ #include "exec/cputlb.h" #include "exec/tb-hash.h" +#include "exec/tb-context.h" #include "exec/translate-all.h" #include "qemu/bitmap.h" #include "qemu/error-report.h"