From patchwork Fri Mar 7 18:56:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 871236 Delivered-To: patch@linaro.org Received: by 2002:a5d:64c8:0:b0:38f:210b:807b with SMTP id f8csp915773wri; Fri, 7 Mar 2025 10:58:28 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVURdbWgaO1WkwoBMxRZLyB25AW/jCTtLqlUvEKridJhgTxQjauIDBWOMbilLGlVErDPGAnIw==@linaro.org X-Google-Smtp-Source: AGHT+IFbjtvxlz8pG4mYN6vaFKIgTm2KUTjpaARkCMyuw3L3TKbWQvN0GrfCysTF/HX6K/+K0yK3 X-Received: by 2002:ad4:4eed:0:b0:6e8:9bcd:bba6 with SMTP id 6a1803df08f44-6e9005d49bemr71649886d6.7.1741373908271; Fri, 07 Mar 2025 10:58:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741373908; cv=none; d=google.com; s=arc-20240605; b=ITQJuP+NAJkhIuVFFX25uq32WKOzPDh5WCyY3Fhm/wrdazFOidY33lofuEXUu3zuiw k4hxbeqKknY6cAKPazDqJqeZfDpDg+NgkL9bGp6nOvyJOal/Bo79HfBUd9BXxsWnrI/i sZm1YXFIn4l3mY4Ok4wfsMz17LPS+qEz6+RV8N+oVD8TZ8Rdox26fhGNvLU2xKifrxGj eEWrEmipr0H2fjtvXu/jzRlhu+4tIY9gvIe847U+vNmqcl9jIuXCYiZsyJu+PryUnW53 3lhPFTAB7Qvlw0zda0Co+slDcGkymT+TTe2K+iyD4D0rla+G+BWRQOa3shrK9SDIDBng aXsg== 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:cc:to :from:dkim-signature; bh=yvub9wKD2OmaGYjgLz+dO6qQURDfWdRF4qq4HxWTWTw=; fh=ycigHkwOPieh2u5PmcA89sNk/qPD1ZkdDlL8Mchfvw8=; b=JiRoQ8SO9MAUijAvs8TqCTMnxTD4oze4SJ0r0MnqSXBBFrbRMgeFygDbAOD8a6e5dP wK7lqd6Hp8JvgKhSxHqcELvBXVxdYe/TZqy5fl2cgty19aMI25sk/oHXFcYBDZWdlhit e0waVJoKSKr92k/NMmQDmM+HHaZsJ8VdydWDIjnz0cUhzLnBTE+yjCxBUZpuBaSOgHen S0hFRLmdRIPO2hR41wOnaNtbLRm+Ut3NqQiUp13bBMXZoYLAYfMAm/kahN1dcfgdJ3mj xF37bUHXhJsE3ZINeYMZYPwUd+slO2eN7mhjBXgeSIZWKh8yb4bGtpBPer6c6KcCDBeZ RY5w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jv/2R72y"; 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 6a1803df08f44-6e8f71628c0si38684876d6.215.2025.03.07.10.58.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 10:58:28 -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="jv/2R72y"; 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 1tqcsf-0007XP-4m; Fri, 07 Mar 2025 13:57:09 -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 1tqcsV-0007TF-5c for qemu-devel@nongnu.org; Fri, 07 Mar 2025 13:56:59 -0500 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqcsT-0007nj-26 for qemu-devel@nongnu.org; Fri, 07 Mar 2025 13:56:58 -0500 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2feb91a25bdso3609191a91.1 for ; Fri, 07 Mar 2025 10:56:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741373816; x=1741978616; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yvub9wKD2OmaGYjgLz+dO6qQURDfWdRF4qq4HxWTWTw=; b=jv/2R72yKIX63Gwhq8rykNOaecp983dYK9zRFCtavI6zQbj6D9zCHhPkFPA//z1o7E REYrUbAXGWi2nfaDXwRc+RtETiUbjdbtPPK6wPnpkbOC4gPj7ASaRz0Yf7/j9ZhOVPXq qzpUBy8ab/kbHyY3DvuoEjqv9xHxVz2XTMAP8nOIkfQ4by72Q76nPcEhKPu+ehwPlY0K kGgzKOTD/spy1zVl58YPZ3mi3CJBKBDyCFAji6XX2aKCqFJyZvXNSlavwrGkxUMny7aj /AzItJ05H66fTQTmCj3Wl41fZheI2ybiYiqFElSqC3A502IbQMXST5yMHSgB3ElRIKjg U3Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741373816; x=1741978616; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yvub9wKD2OmaGYjgLz+dO6qQURDfWdRF4qq4HxWTWTw=; b=as2J1t9wJk1HpAkDE95JobTTrtNfYhLqydmnCrh61pjNE9HEEQij4TZYM7+19lINWz gd4OVaP6jQUU8IFYa6Z72qB3AMLZeWj4e8biXY+PHKqiLJ/NSWVIyfFk1NwvxAZEV08F zgSa0JQ/QRFLSfrU2TQrYyeWvIMxjZsTXcxyqgOVBDWEI1yqY8RTphkiLo8vuSBn6SXl vjq26bgRY7SFk5w+X0Tw0wV7z+fVnqQN9TGsnqsuZwaqjxAd0zr0Bi5N2krW1w6MhANc pGsk41Y3zDQb2wb7VeanvhXV+nussF3GzVAKiuRd5fosd+KIqcbvDiGU/DQeoKPdvLfR ozwQ== X-Gm-Message-State: AOJu0Yw6+Jm/MOyq7WXQ1bkf/q3bqKFbjlQK1OqIKx1mGTrNFgmgz8Fw B10IAvCDmRz/hQc6krkr0CY+uusOi/MNJO6G2etq1QD10TZFW3RHmrWOYG0y8jw1C3EZma3oaYc Q X-Gm-Gg: ASbGncusRWO8QmNmyNfJxu86YCEHcE4CIQk5e+0sTtWLK8Vg5iEY3nO8gsx2scoH5/+ KpgP0LkSZBeqNtvrW5gAh5rz04LFQDfAuixvjhf5mcnLnxdPL3GdzjqN0gS3nITybeh1sV4KZdc qqsk0YmWzqKIreQXv67/wRr12iFMClY9aqJhM2zqA2LLBzgwiQwYAZNkKu9OYUEZZXAHATUu8ub u2mTJ3L/rszLXSbWnSe1IAcH0jdQa21Q8jpCDJnN2RyChB8PCgMKzG4PDDgzQqTwc2ajNEEOlm6 vATVWs1sEFbxu9gsrjL96BkVvvkVGxzhpXkeTyFFOkraw3ZZyAfEmN8wvFBm7gAuOKfD0pUWqqF 8 X-Received: by 2002:a17:90b:3c41:b0:2fa:157e:c78e with SMTP id 98e67ed59e1d1-2ff7ce65536mr7470098a91.7.1741373815798; Fri, 07 Mar 2025 10:56:55 -0800 (PST) Received: from stoup.. (174-21-74-48.tukw.qwest.net. [174.21.74.48]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ff693534f8sm3391917a91.17.2025.03.07.10.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 10:56:55 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH 11/16] accel/tcg: Build tcg-accel-ops-icount.c once Date: Fri, 7 Mar 2025 10:56:40 -0800 Message-ID: <20250307185645.970034-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250307185645.970034-1-richard.henderson@linaro.org> References: <20250307185645.970034-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.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 All that is required is to avoid including exec-all.h. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- accel/tcg/tcg-accel-ops-icount.c | 2 +- accel/tcg/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/accel/tcg/tcg-accel-ops-icount.c b/accel/tcg/tcg-accel-ops-icount.c index d6b472a0b0..27cf1044c7 100644 --- a/accel/tcg/tcg-accel-ops-icount.c +++ b/accel/tcg/tcg-accel-ops-icount.c @@ -28,7 +28,7 @@ #include "system/cpu-timers.h" #include "qemu/main-loop.h" #include "qemu/guest-random.h" -#include "exec/exec-all.h" +#include "hw/core/cpu.h" #include "tcg-accel-ops.h" #include "tcg-accel-ops-icount.h" diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 70ada21f42..891b724eb6 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -21,7 +21,6 @@ specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss) specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( 'cputlb.c', 'tcg-accel-ops-mttcg.c', - 'tcg-accel-ops-icount.c', 'tcg-accel-ops-rr.c', )) @@ -29,5 +28,6 @@ system_ss.add(when: ['CONFIG_TCG'], if_true: files( 'icount-common.c', 'monitor.c', 'tcg-accel-ops.c', + 'tcg-accel-ops-icount.c', 'watchpoint.c', ))